Changeset 63227 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 9, 2016 4:55:19 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8422: Desktop-widget watchdog rework (part 15): Extend interface with few more advanced required wrappers.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIDesktopWidgetWatchdog.cpp (modified) (1 diff)
• UIDesktopWidgetWatchdog.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp

@@ -227 +227 @@
 }
 
+const QRegion UIDesktopWidgetWatchdog::overallScreenRegion() const
+{
+    /* Calculate region: */
+    QRegion region;
+    for (int iScreenIndex = 0; iScreenIndex < gpDesktop->screenCount(); ++iScreenIndex)
+    {
+        /* Get enumerated screen's available area: */
+        QRect rect = gpDesktop->screenGeometry(iScreenIndex);
+#ifdef VBOX_WS_WIN
+        /* On Windows host window can exceed the available
+         * area in maximized/sticky-borders state: */
+        rect.adjust(-10, -10, 10, 10);
+#endif /* VBOX_WS_WIN */
+        /* Append rectangle: */
+        region += rect;
+    }
+    /* Return region: */
+    return region;
+}
+
+const QRegion UIDesktopWidgetWatchdog::overallAvailableRegion() const
+{
+    /* Calculate region: */
+    QRegion region;
+    for (int iScreenIndex = 0; iScreenIndex < gpDesktop->screenCount(); ++iScreenIndex)
+    {
+        /* Get enumerated screen's available area: */
+        QRect rect = gpDesktop->availableGeometry(iScreenIndex);
+#ifdef VBOX_WS_WIN
+        /* On Windows host window can exceed the available
+         * area in maximized/sticky-borders state: */
+        rect.adjust(-10, -10, 10, 10);
+#endif /* VBOX_WS_WIN */
+        /* Append rectangle: */
+        region += rect;
+    }
+    /* Return region: */
+    return region;
+}
+
 #if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
 bool UIDesktopWidgetWatchdog::isFakeScreenDetected() const

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.h

@@ -93 +93 @@
     const QRect availableGeometry(const QPoint &point) const;
 
+    /** Returns overall region unifying all the host-screen geometries. */
+    const QRegion overallScreenRegion() const;
+    /** Returns overall region unifying all the host-screen available-geometries. */
+    const QRegion overallAvailableRegion() const;
+
 #if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
     /** Qt5: X11: Returns whether no or fake screen detected. */