diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-05-14 15:17:55 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-10-20 07:26:00 +0200 |
| commit | 210128cc0e582b01a8dbd4dd9f71a19406d8c89d (patch) | |
| tree | 83e32eed9e2ecd13898c108ebc1eb29864c67e08 /src/gui | |
| parent | 85ed79e5913332e5c44797ef2346fc5913948ac4 (diff) | |
QHighDpi: revert window-on-multiple-screens handling
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>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qhighdpiscaling_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h index 422f76134a..86f74b26a9 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); } |