From 58d464566160383b8e53d17a53629b9c06684c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20de=20la=20Rocha?= Date: Wed, 20 Apr 2022 19:10:05 +0200 Subject: 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 Reviewed-by: Volker Hilsheimer --- src/plugins/platforms/windows/qwindowswindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3