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, 9 insertions, 8 deletions

diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index c073b8fb03..1f36c192f5 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -342,7 +342,15 @@ public:
     QPainter *sharedPainter() const;
     void setSharedPainter(QPainter *painter);
     QWidgetBackingStore *maybeBackingStore() const;
-    QWidgetWindow *windowHandle() const;
+
+    enum class WindowHandleMode {
+        Direct,
+        Closest,
+        TopLevel
+    };
+    QWindow *windowHandle(WindowHandleMode mode = WindowHandleMode::Direct) const;
+
+    QScreen *associatedScreen() const;
 
     template <typename T>
     void repaint(T t);
@@ -1014,13 +1022,6 @@ inline QWidgetBackingStore *QWidgetPrivate::maybeBackingStore() const
     return x ? x->backingStoreTracker.data() : nullptr;
 }
 
-inline QWidgetWindow *QWidgetPrivate::windowHandle() const
-{
-    if (QTLWExtra *x = maybeTopData())
-        return x->window;
-    return nullptr;
-}
-
 QT_END_NAMESPACE
 
 #endif // QWIDGET_P_H