diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-01-13 09:55:03 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-01-13 22:00:22 +0100 |
| commit | 87a62e46e4352e069aec9cc709a578019cc1715f (patch) | |
| tree | 40dac98702d7b60574ae642e282cf40970c082ae /src/widgets | |
| parent | 55928821d1b119112c520af3b83dc9ed210cf5f0 (diff) | |
Don't return an associated screen for embedded widgets
Widgets embedded in a graphics view via QGraphicsProxyWidget don't have
an associated screen, even though they are top level windows in the
widget hierarchy.
Their screen has to be based on the screen of the toplevel widget they
are embedded in. This fallback is taken care of by QWidget::screen
already.
Task-number: QTBUG-20531
Pick-to: 6.3
Change-Id: I77af092b2f8e6322662499be464eec40cfd9ac1c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 1a76b887ee..80dcadb81f 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1104,6 +1104,11 @@ QWindow *QWidgetPrivate::_q_closestWindowHandle() const QScreen *QWidgetPrivate::associatedScreen() const { +#if QT_CONFIG(graphicsview) + // embedded widgets never have a screen associated, let QWidget::screen fall back to toplevel + if (nearestGraphicsProxyWidget(q_func())) + return nullptr; +#endif if (auto window = windowHandle(WindowHandleMode::Closest)) return window->screen(); return nullptr; |