Add accessors for QWindow and QScreen to QWidgetPrivate

Rewrite the existing accessor QWidgetPrivate::windowHandle() to
accept a mode enumeration that has an "Any" convenience.

Based on that, add QWidgetPrivate::associatedScreen(), which is seful
in many places where scaling is performed.

Prototypically simplify the code.

Task-number: QTBUG-62094
Task-number: QTBUG-73231
Change-Id: I516288363d329bce9bc94e4951106f9357bc6cde
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
 
 
 

1 files changed, 2 insertions, 10 deletions

diff --git a/src/widgets/kernel/qdesktopwidget.cpp b/src/widgets/kernel/qdesktopwidget.cpp
index d17c7eb36c..ac0cfcf2f5 100644
--- a/src/widgets/kernel/qdesktopwidget.cpp
+++ b/src/widgets/kernel/qdesktopwidget.cpp
@@ -321,20 +321,12 @@ int QDesktopWidgetPrivate::screenNumber(const QWidget *w)
     if (screens.isEmpty()) // This should never happen
         return primaryScreen();
 
-    const QWindow *winHandle = w->windowHandle();
-    if (!winHandle) {
-        if (const QWidget *nativeParent = w->nativeParentWidget())
-            winHandle = nativeParent->windowHandle();
-    }
-
     // If there is more than one virtual desktop
     if (screens.count() != screens.constFirst()->virtualSiblings().count()) {
         // Find the root widget, get a QScreen from it and use the
         // virtual siblings for checking the window position.
-        if (winHandle) {
-            if (const QScreen *winScreen = winHandle->screen())
-                screens = winScreen->virtualSiblings();
-        }
+        if (const QScreen *winScreen = qt_widget_private(const_cast<QWidget *>(w))->associatedScreen())
+            screens = winScreen->virtualSiblings();
     }
 
     // Get the screen number from window position using screen geometry