From 7dc2532bed8977dd4166e9aa4be021b0ec39b5ba Mon Sep 17 00:00:00 2001 From: Mauro Persano Date: Fri, 28 Feb 2025 14:17:19 -0300 Subject: [PATCH] Determine screen with initialGeometry when not positioning automatically MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Popups aren't automatically positioned, so use the screen at the initial geometry for scaling. Otherwise we may end up with the wrong geometry on systems that have multiple screens with different scales. Pick-to: 6.9 6.8 Fixes: QTBUG-134139 Change-Id: I686b1c8ab6cf458d9b849b529ba247ac8c3be064 Reviewed-by: Oliver Wolff Reviewed-by: Tor Arne Vestbø --- src/gui/kernel/qplatformwindow.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index 2a9fb240a8e..fff2709b89f 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -702,10 +702,10 @@ QRect QPlatformWindow::initialGeometry(const QWindow *w, const QRect &initialGeo return QRect(initialGeometry.topLeft(), QHighDpi::toNative(deviceIndependentSize, factor)); } const auto *wp = qt_window_private(const_cast(w)); - const bool position = wp->positionAutomatic && w->type() != Qt::Popup; - if (!position && !wp->resizeAutomatic) + const bool positionAutomatic = wp->positionAutomatic && w->type() != Qt::Popup; + if (!positionAutomatic && !wp->resizeAutomatic) return initialGeometry; - const QScreen *screen = wp->positionAutomatic + const QScreen *screen = positionAutomatic ? effectiveScreen(w) : QGuiApplication::screenAt(initialGeometry.center()); if (!screen) @@ -717,7 +717,7 @@ QRect QPlatformWindow::initialGeometry(const QWindow *w, const QRect &initialGeo if (wp->resizeAutomatic) deviceIndependentRect.setSize( fixInitialSize(deviceIndependentRect.size(), w, defaultWidth, defaultHeight)); - if (position) { + if (positionAutomatic) { const QRect availableDeviceIndependentGeometry = screen->availableGeometry(); // Center unless the geometry ( + unknown window frame) is too large for the screen). if (deviceIndependentRect.height() < (availableDeviceIndependentGeometry.height() * 8) / 9