diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-14 08:23:41 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-14 08:23:41 +0200 |
| commit | 00e1917f85e97b6fa7a78b2ed8767c54ec4d9e53 (patch) | |
| tree | 6d93d682fcdecfa54c635e561aeaa6fcfa3bc634 /src/gui/kernel/qhighdpiscaling_p.h | |
| parent | 56acf089c7759ce21a5bc3ce32616df5b01e78ef (diff) | |
| parent | 09504d484c258eafb10ac12eeda1becda5b985c1 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Id3d16035c9692af42e9c1bf512218f3c836ae2eb
Diffstat (limited to 'src/gui/kernel/qhighdpiscaling_p.h')
| -rw-r--r-- | src/gui/kernel/qhighdpiscaling_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h index 83fc9452c5..28cf7de75b 100644 --- a/src/gui/kernel/qhighdpiscaling_p.h +++ b/src/gui/kernel/qhighdpiscaling_p.h @@ -83,8 +83,10 @@ public: static qreal factor(const QPlatformScreen *platformScreen); static QPoint origin(const QScreen *screen); static QPoint origin(const QPlatformScreen *platformScreen); - static QPoint mapPositionFromNative(const QPoint &pos, const QPlatformScreen *platformScreen); static QPoint mapPositionToNative(const QPoint &pos, const QPlatformScreen *platformScreen); + static QPoint mapPositionFromNative(const QPoint &pos, const QPlatformScreen *platformScreen); + static QPoint mapPositionToGlobal(const QPoint &pos, const QPoint &windowGlobalPosition, const QWindow *window); + static QPoint mapPositionFromGlobal(const QPoint &pos, const QPoint &windowGlobalPosition, const QWindow *window); static QDpi logicalDpi(); private: |