diff options
Diffstat (limited to 'src/gui/kernel/qscreen_p.h')
-rw-r--r-- | src/gui/kernel/qscreen_p.h | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h index 1ba0c7c442..964bc1cc58 100644 --- a/src/gui/kernel/qscreen_p.h +++ b/src/gui/kernel/qscreen_p.h @@ -24,21 +24,8 @@ QT_BEGIN_NAMESPACE -class QScreenPrivate : public QObjectPrivate +struct QScreenData { - 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 updatePrimaryOrientation(); - void updateGeometriesWithSignals(); - void emitGeometryChangeSignals(bool geometryChanged, bool availableGeometryChanged); - QPlatformScreen *platformScreen = nullptr; Qt::ScreenOrientation orientation = Qt::PrimaryOrientation; @@ -49,6 +36,25 @@ public: qreal refreshRate = 60; }; +class QScreenPrivate : public QObjectPrivate, public QScreenData +{ + Q_DECLARE_PUBLIC(QScreen) +public: + void updateGeometry(); + void updatePrimaryOrientation(); + + class UpdateEmitter + { + public: + explicit UpdateEmitter(QScreen *screen); + ~UpdateEmitter(); + UpdateEmitter(UpdateEmitter&&) noexcept = default; + private: + Q_DISABLE_COPY(UpdateEmitter) + QScreenData initialState; + }; +}; + QT_END_NAMESPACE #endif // QSCREEN_P_H |