diff options
| author | André de la Rocha <andre.rocha@qt.io> | 2022-04-20 19:10:05 +0200 |
|---|---|---|
| committer | André de la Rocha <andre.rocha@qt.io> | 2022-05-05 01:17:38 +0200 |
| commit | 58d464566160383b8e53d17a53629b9c06684c7a (patch) | |
| tree | 0a7a0aced15dc75e75a280e5cc9432f8c8f4f200 /src/plugins/platforms/windows/qwindowswindow.cpp | |
| parent | fcc64a57cf6995046be83e93cb1c466b27f51917 (diff) | |
Windows: Fix pop-up windows being incorrectly moved to primary display
Amends a previous workaround used with AMD graphic adapters, which under
some circumstances could incorrectly move pop-up windows and cause
issues with menus.
Fixes: QTBUG-97533
Pick-to: 6.2 6.3
Change-Id: Icc83198913b0e78ae3d7c0679e46f8b46b7015bf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowswindow.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 2a91b466f9..389c2249e1 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -693,7 +693,7 @@ static QPoint calcPosition(const QWindow *w, const QWindowCreationContextPtr &co { const QPoint orgPos(context->frameX - invMargins.left(), context->frameY - invMargins.top()); - if (!w || (!w->isTopLevel() && w->surfaceType() != QWindow::OpenGLSurface)) + if (!w || w->type() != Qt::Window) return orgPos; // Workaround for QTBUG-50371 |