Changeset 97706 in vbox for trunk/src/VBox

Timestamp:

Nov 29, 2022 2:55:21 PM (2 years ago)

Author:

vboxsync

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

154763

Message:

FE/Qt: bugref:9898: Migrating UIDesktopWidgetWatchdog class to Qt6; Screen index stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDesktopWidgetWatchdog.cpp (modified) (3 diffs)
• globals/UIDesktopWidgetWatchdog.h (modified) (1 diff)
• runtime/UIMouseHandler.cpp (modified) (1 diff)

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

@@ -302 +302 @@
 
 /* static */
-int UIDesktopWidgetWatchdog::primaryScreen()
-{
-#ifdef VBOX_IS_QT6_OR_LATER
+int UIDesktopWidgetWatchdog::primaryScreenNumber()
+{
     return screenToIndex(QGuiApplication::primaryScreen());
-#else
-    /* Redirect call to desktop-widget: */
-    return QApplication::desktop()->primaryScreen();
-#endif
 }
 
@@ -315 +310 @@
 int UIDesktopWidgetWatchdog::screenNumber(const QWidget *pWidget)
 {
-#ifdef VBOX_IS_QT6_OR_LATER
+    QScreen *pScreen = 0;
     if (pWidget)
-        return screenToIndex(pWidget->screen());
-    return -1;
-#else
-    /* Redirect call to desktop-widget: */
-    return QApplication::desktop()->screenNumber(pWidget);
-#endif
+        if (QWindow *pWindow = pWidget->windowHandle())
+            pScreen = pWindow->screen();
+
+    return screenToIndex(pScreen);
 }
 
@@ -328 +321 @@
 int UIDesktopWidgetWatchdog::screenNumber(const QPoint &point)
 {
-#ifdef VBOX_IS_QT6_OR_LATER
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
     return screenToIndex(QGuiApplication::screenAt(point));
-#else
-    /* Redirect call to desktop-widget: */
+#else /* Qt < 5.10 */
     return QApplication::desktop()->screenNumber(point);
-#endif
+#endif /* Qt < 5.10 */
 }
 

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

@@ -87 +87 @@
 
     /** Returns primary screen index. */
-    static int primaryScreen();
-
+    static int primaryScreenNumber();
     /** Returns the index of the screen which contains contains @a pWidget. */
     static int screenNumber(const QWidget *pWidget);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp

@@ -1021 +1021 @@
             // For that we have to map logical coordinates to relative origin (to make logical=>physical conversion).
             // Besides that we have to make sure m_lastMousePos still uses logical coordinates afterwards.
-            const double dDprPrimary = UIDesktopWidgetWatchdog::devicePixelRatio(UIDesktopWidgetWatchdog::primaryScreen());
+            const double dDprPrimary = UIDesktopWidgetWatchdog::devicePixelRatio(UIDesktopWidgetWatchdog::primaryScreenNumber());
             const double dDprCurrent = UIDesktopWidgetWatchdog::devicePixelRatio(m_windows.value(m_iMouseCaptureViewIndex));
             const QRect screenGeometry = gpDesktop->screenGeometry(m_windows.value(m_iMouseCaptureViewIndex));