Changeset 97704 in vbox for trunk/src/VBox

Timestamp:

Nov 29, 2022 12:23:10 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154761

Message:

FE/Qt: bugref:9898: Migrating UIDesktopWidgetWatchdog class to Qt6; A bit of cleanup and build fix.

Location:

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

Files:

• UIDesktopWidgetWatchdog.cpp (modified) (3 diffs)
• UIDesktopWidgetWatchdog.h (modified) (3 diffs)

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

@@ -296 +296 @@
 
 /* static */
-int UIDesktopWidgetWatchdog::overallDesktopWidth()
-{
-#ifdef VBOX_IS_QT6_OR_LATER
-    /** @todo bird: Not sure if this is entirely correct. */
-    return QGuiApplication::primaryScreen()->geometry().width();
-#else
-    /* Redirect call to desktop-widget: */
-    return QApplication::desktop()->width();
-#endif
-}
-
-/* static */
-int UIDesktopWidgetWatchdog::overallDesktopHeight()
-{
-#ifdef VBOX_IS_QT6_OR_LATER
-    /** @todo bird: Not sure if this is entirely correct. */
-    return QGuiApplication::primaryScreen()->geometry().height();
-#else
-    /* Redirect call to desktop-widget: */
-    return QApplication::desktop()->height();
-#endif
-}
-
-/* static */
 int UIDesktopWidgetWatchdog::screenCount()
 {
     return QGuiApplication::screens().size();
-}
-
-/** Helper for generating qt5 screen indexes as best as we can. */
-static int screenToIndex(QScreen *pScreen)
-{
-    if (pScreen)
-    {
-        /** @todo Not at all sure about the sensitibility of this.   */
-        QList<QScreen *> screenList = QGuiApplication::screens();
-        unsigned         iScreen    = 0;
-        foreach (QScreen *pCurScreen, screenList)
-        {
-            if (   pCurScreen == pScreen
-                || (   pCurScreen->geometry() == pScreen->geometry()
-                    && pCurScreen->serialNumber() == pScreen->serialNumber()))
-                return iScreen;
-            iScreen++;
-        }
-    }
-    return -1;
 }
 
@@ -524 +480 @@
     /* Return region: */
     return region;
+}
+
+/* static */
+int UIDesktopWidgetWatchdog::overallDesktopWidth()
+{
+#ifdef VBOX_IS_QT6_OR_LATER
+    /** @todo bird: Not sure if this is entirely correct. */
+    return QGuiApplication::primaryScreen()->geometry().width();
+#else
+    /* Redirect call to desktop-widget: */
+    return QApplication::desktop()->width();
+#endif
+}
+
+/* static */
+int UIDesktopWidgetWatchdog::overallDesktopHeight()
+{
+#ifdef VBOX_IS_QT6_OR_LATER
+    /** @todo bird: Not sure if this is entirely correct. */
+    return QGuiApplication::primaryScreen()->geometry().height();
+#else
+    /* Redirect call to desktop-widget: */
+    return QApplication::desktop()->height();
+#endif
 }
 
@@ -1084 +1064 @@
 
 /* static */
+int UIDesktopWidgetWatchdog::screenToIndex(QScreen *pScreen)
+{
+    if (pScreen)
+    {
+        unsigned iScreen = 0;
+        foreach (QScreen *pCurScreen, QGuiApplication::screens())
+        {
+            if (   pCurScreen == pScreen
+                || (   pCurScreen->geometry() == pScreen->geometry()
+                    && pCurScreen->serialNumber() == pScreen->serialNumber()))
+                return iScreen;
+            ++iScreen;
+        }
+    }
+    return -1;
+}
+
+/* static */
 QRegion UIDesktopWidgetWatchdog::flip(const QRegion &region)
 {

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

@@ -82 +82 @@
     /** Destroys the static instance of the desktop-widget watchdog. */
     static void destroy();
-
-    /** Returns overall desktop width. */
-    static int overallDesktopWidth();
-    /** Returns overall desktop height. */
-    static int overallDesktopHeight();
 
     /** Returns the number of host-screens currently available on the system. */
@@ -123 +118 @@
     /** Returns overall region unifying all the host-screen available-geometries. */
     QRegion overallAvailableRegion() const;
+    /** Returns overall desktop width. */
+    static int overallDesktopWidth();
+    /** Returns overall desktop height. */
+    static int overallDesktopHeight();
 
 #ifdef VBOX_WS_X11
@@ -190 +189 @@
     void cleanup();
 
+    /** Returns index of passed @a pScreen. */
+    static int screenToIndex(QScreen *pScreen);
+
     /** Returns the flipped (transposed) @a region. */
     static QRegion flip(const QRegion &region);