File 3002-QHighDpi-revert-window-on-multiple-screens... of Package libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File 3002-QHighDpi-revert-window-on-multiple-screens-handling.patch of Package libqt5-qtbase

From 4c3e246f05d32937bb0d0b63a018d3e3351baffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Thu, 14 May 2020 15:17:55 +0200
Subject: [PATCH 3002/3009] QHighDpi: revert window-on-multiple-screens
 handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make fromNativePixels() use QWindow:screen() for determining
which screen's scale factor to use, even if the point-to-be-scaled
is on a different screen.

We'll add API for handling the window-on-multiple-screens
case in subsequent commits.

Task-number: QTBUG-81695
Change-Id: Ib9f40a5a636b2487204c14301ad0190727dcf4ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 210128cc0e582b01a8dbd4dd9f71a19406d8c89d)
---
 src/gui/kernel/qhighdpiscaling_p.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h
index 5b02c5d646..a9e756bcd8 100644
--- a/src/gui/kernel/qhighdpiscaling_p.h
+++ b/src/gui/kernel/qhighdpiscaling_p.h
@@ -218,8 +218,7 @@ inline QPoint position(QRectF rect) { return rect.center().toPoint(); }
 template <typename T, typename C>
 T fromNativePixels(const T &value, const C *context)
 {
-    QPoint nativePosition = position(value);
-    QHighDpiScaling::ScaleAndOrigin so = QHighDpiScaling::scaleAndOrigin(context, &nativePosition);
+    QHighDpiScaling::ScaleAndOrigin so = QHighDpiScaling::scaleAndOrigin(context);
     return scale(value, qreal(1) / so.factor, so.origin);
 }
 
-- 
2.29.2

Places

File 3002-QHighDpi-revert-window-on-multiple-screens-handling.patch of Package libqt5-qtbase

Places