From 1032bf9fdb40a0bc37cafc2b9c54a50f539d32db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 7 Sep 2022 13:29:36 +0200 Subject: [PATCH] De-inline QScreenPrivate::updateHighDpi() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make it easier to reason about the flow of high-DPI scaling when the implementation is not "hidden" away in a private header. Change-Id: I6350798c43ead213323f8e01d9761f2d185c6b00 Reviewed-by: Morten Johan Sørvig --- src/gui/kernel/qscreen.cpp | 5 +++++ src/gui/kernel/qscreen_p.h | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index 1e5db5c4d3..601d2f1718 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/src/gui/kernel/qscreen.cpp @@ -89,6 +89,11 @@ void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen) updatePrimaryOrientation(); // derived from the geometry } +void QScreenPrivate::updateHighDpi() +{ + geometry = platformScreen->deviceIndependentGeometry(); + availableGeometry = QHighDpi::fromNative(platformScreen->availableGeometry(), QHighDpiScaling::factor(platformScreen), geometry.topLeft()); +} /*! Destroys the screen. diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h index 1ba0c7c442..67b42bda6f 100644 --- a/src/gui/kernel/qscreen_p.h +++ b/src/gui/kernel/qscreen_p.h @@ -29,11 +29,7 @@ class QScreenPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QScreen) public: void setPlatformScreen(QPlatformScreen *screen); - void updateHighDpi() - { - geometry = platformScreen->deviceIndependentGeometry(); - availableGeometry = QHighDpi::fromNative(platformScreen->availableGeometry(), QHighDpiScaling::factor(platformScreen), geometry.topLeft()); - } + void updateHighDpi(); void updatePrimaryOrientation(); void updateGeometriesWithSignals();