diff options
| -rw-r--r-- | src/gui/kernel/qhighdpiscaling.cpp | 15 | ||||
| -rw-r--r-- | src/gui/kernel/qhighdpiscaling_p.h | 9 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp index 40e34edbe8..496cae7c26 100644 --- a/src/gui/kernel/qhighdpiscaling.cpp +++ b/src/gui/kernel/qhighdpiscaling.cpp @@ -720,5 +720,20 @@ QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QWindow *w return scaleAndOrigin(screen, searchScreen ? nativePosition : nullptr); } +#else +QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QPlatformScreen *, QPoint *) +{ + return { qreal(1), QPoint() }; +} + +QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QScreen *, QPoint *) +{ + return { qreal(1), QPoint() }; +} + +QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QWindow *, QPoint *) +{ + return { qreal(1), QPoint() }; +} #endif //QT_NO_HIGHDPISCALING QT_END_NAMESPACE diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h index cbb05cf69e..ed493a94c6 100644 --- a/src/gui/kernel/qhighdpiscaling_p.h +++ b/src/gui/kernel/qhighdpiscaling_p.h @@ -303,6 +303,15 @@ public: static inline void setGlobalFactor(qreal) {} static inline void setScreenFactor(QScreen *, qreal) {} + struct ScaleAndOrigin + { + qreal factor; + QPoint origin; + }; + static ScaleAndOrigin scaleAndOrigin(const QPlatformScreen *platformScreen, QPoint *nativePosition = nullptr); + static ScaleAndOrigin scaleAndOrigin(const QScreen *screen, QPoint *nativePosition = nullptr); + static ScaleAndOrigin scaleAndOrigin(const QWindow *platformScreen, QPoint *nativePosition = nullptr); + static inline bool isActive() { return false; } static inline qreal factor(const QWindow *) { return 1.0; } static inline qreal factor(const QScreen *) { return 1.0; } |