From a0f53ec9708dd8032b466b868883f8118ab7c7ef Mon Sep 17 00:00:00 2001
From: Thomas Sondergaard <thomas@sondergaard.cc>
Date: Thu, 5 Sep 2024 12:45:03 +0200
Subject: [PATCH] QScreen: Apply high-DPI scale to availableGeometry size, not
 position
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Treat geometry and availableGeometry in the same way so the position
is in native coordinates and only the size is scaled.

Task-number: QTBUG-128660
Change-Id: If1355014fd6dd1a204cab7177d7941c980dda0ad
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 src/gui/kernel/qscreen.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
index 83641e76760..415acaf4303 100644
--- a/src/gui/kernel/qscreen.cpp
+++ b/src/gui/kernel/qscreen.cpp
@@ -61,7 +61,8 @@ void QScreenPrivate::updateGeometry()
     qreal scaleFactor = QHighDpiScaling::factor(platformScreen);
     QRect nativeGeometry = platformScreen->geometry();
     geometry = QRect(nativeGeometry.topLeft(), QHighDpi::fromNative(nativeGeometry.size(), scaleFactor));
-    availableGeometry = QHighDpi::fromNative(platformScreen->availableGeometry(), scaleFactor, geometry.topLeft());
+    QRect nativeAvailableGeometry = platformScreen->availableGeometry();
+    availableGeometry = QRect(nativeAvailableGeometry.topLeft(), QHighDpi::fromNative(nativeAvailableGeometry.size(), scaleFactor));
 }
 
 /*!