diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-07-28 15:37:05 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-09-10 14:31:35 +0200 |
| commit | 2368e62f32e39abdad54260fa4a7b1b6018e5b04 (patch) | |
| tree | ee8a37e8384418b3d8d99e2d703d4d8e59a4bf7d /src/gui/kernel/qscreen.h | |
| parent | 2d2dc976d83b7a862af20f631657175f6a83790c (diff) | |
qpa: Make screen geometry updates (full and available geometry) atomic
Updating the geometry and available geometry in two steps means that
QScreen will be in an inconsistent state when emitting the geometry
change signal, as the available geometry has not been updated yet.
Piggy-backing changes to the availableGeometry based on the virtual
geometry changing does not make sense, so we now tie geometry and
availableGeometry (and their size variants) to their own separate
geometryChanged and availableGeometryChanged signals.
Change-Id: Iee0ced642cbb91c470cb54bc507d2c0512482c13
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/gui/kernel/qscreen.h')
| -rw-r--r-- | src/gui/kernel/qscreen.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qscreen.h b/src/gui/kernel/qscreen.h index 9e439f5a20..4ee48ad5ad 100644 --- a/src/gui/kernel/qscreen.h +++ b/src/gui/kernel/qscreen.h @@ -69,11 +69,11 @@ class Q_GUI_EXPORT QScreen : public QObject Q_PROPERTY(QString name READ name CONSTANT) Q_PROPERTY(int depth READ depth CONSTANT) Q_PROPERTY(QSize size READ size NOTIFY geometryChanged) - Q_PROPERTY(QSize availableSize READ availableSize NOTIFY virtualGeometryChanged) + Q_PROPERTY(QSize availableSize READ availableSize NOTIFY availableGeometryChanged) Q_PROPERTY(QSize virtualSize READ virtualSize NOTIFY virtualGeometryChanged) Q_PROPERTY(QSize availableVirtualSize READ availableVirtualSize NOTIFY virtualGeometryChanged) Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged) - Q_PROPERTY(QRect availableGeometry READ availableGeometry NOTIFY virtualGeometryChanged) + Q_PROPERTY(QRect availableGeometry READ availableGeometry NOTIFY availableGeometryChanged) Q_PROPERTY(QRect virtualGeometry READ virtualGeometry NOTIFY virtualGeometryChanged) Q_PROPERTY(QRect availableVirtualGeometry READ availableVirtualGeometry NOTIFY virtualGeometryChanged) Q_PROPERTY(QSizeF physicalSize READ physicalSize NOTIFY physicalSizeChanged) @@ -142,6 +142,7 @@ public: Q_SIGNALS: void geometryChanged(const QRect &geometry); + void availableGeometryChanged(const QRect &geometry); void physicalSizeChanged(const QSizeF &size); void physicalDotsPerInchChanged(qreal dpi); void logicalDotsPerInchChanged(qreal dpi); |