diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-11-22 10:34:47 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-30 19:04:18 +0100 |
| commit | 6468dd4179278276d3ad98696b6f761efa397924 (patch) | |
| tree | e744103b678b4e795350df13eaa892c34a1ba979 /src/gui/kernel/qscreen.h | |
| parent | cc9c85ecd68c8dae28567dac630f894faaaf1acf (diff) | |
Made more QScreen properties NOTIFY and added average DPI properties.
The physicalDotsPerInch() is the average of the horizontal and vertical
physical dots per inch, and likewise logicalDotsPerInch() is the average
of the horizontal and vertical logical dots per inch.
Change-Id: I18aa610dc9a63efe062f78c823ba29f90b2712f4
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/gui/kernel/qscreen.h')
| -rw-r--r-- | src/gui/kernel/qscreen.h | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/src/gui/kernel/qscreen.h b/src/gui/kernel/qscreen.h index 8631180a8f..6fc97c1799 100644 --- a/src/gui/kernel/qscreen.h +++ b/src/gui/kernel/qscreen.h @@ -70,17 +70,17 @@ 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 CONSTANT) - Q_PROPERTY(QRect geometry READ geometry CONSTANT) + Q_PROPERTY(QSize size READ size NOTIFY sizeChanged) + Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged) Q_PROPERTY(QSizeF physicalSize READ physicalSize CONSTANT) - Q_PROPERTY(qreal physicalDotsPerInchX READ physicalDotsPerInchX CONSTANT) - Q_PROPERTY(qreal physicalDotsPerInchY READ physicalDotsPerInchY CONSTANT) - Q_PROPERTY(qreal logicalDotsPerInchX READ logicalDotsPerInchX CONSTANT) - Q_PROPERTY(qreal logicalDotsPerInchY READ logicalDotsPerInchY CONSTANT) - Q_PROPERTY(QSize availableSize READ availableSize CONSTANT) - Q_PROPERTY(QRect availableGeometry READ availableGeometry CONSTANT) - Q_PROPERTY(QSize virtualSize READ virtualSize CONSTANT) - Q_PROPERTY(QRect availableVirtualGeometry READ availableVirtualGeometry CONSTANT) + Q_PROPERTY(qreal physicalDotsPerInchX READ physicalDotsPerInchX NOTIFY physicalDotsPerInchXChanged) + Q_PROPERTY(qreal physicalDotsPerInchY READ physicalDotsPerInchY NOTIFY physicalDotsPerInchYChanged) + Q_PROPERTY(qreal physicalDotsPerInch READ physicalDotsPerInch NOTIFY physicalDotsPerInchChanged) + Q_PROPERTY(qreal logicalDotsPerInchX READ logicalDotsPerInchX NOTIFY logicalDotsPerInchXChanged) + Q_PROPERTY(qreal logicalDotsPerInchY READ logicalDotsPerInchY NOTIFY logicalDotsPerInchYChanged) + Q_PROPERTY(qreal logicalDotsPerInch READ logicalDotsPerInch NOTIFY logicalDotsPerInchChanged) + Q_PROPERTY(QSize availableSize READ availableSize NOTIFY availableSizeChanged) + Q_PROPERTY(QRect availableGeometry READ availableGeometry NOTIFY availableGeometryChanged) Q_PROPERTY(Qt::ScreenOrientation primaryOrientation READ primaryOrientation CONSTANT) Q_PROPERTY(Qt::ScreenOrientation currentOrientation READ currentOrientation NOTIFY currentOrientationChanged) @@ -98,9 +98,11 @@ public: qreal physicalDotsPerInchX() const; qreal physicalDotsPerInchY() const; + qreal physicalDotsPerInch() const; qreal logicalDotsPerInchX() const; qreal logicalDotsPerInchY() const; + qreal logicalDotsPerInch() const; QSize availableSize() const; QRect availableGeometry() const; @@ -121,6 +123,16 @@ public: static QRect mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &rect); Q_SIGNALS: + void sizeChanged(const QSize &size); + void geometryChanged(const QRect &geometry); + void physicalDotsPerInchXChanged(qreal dpi); + void physicalDotsPerInchYChanged(qreal dpi); + void physicalDotsPerInchChanged(qreal dpi); + void logicalDotsPerInchXChanged(qreal dpi); + void logicalDotsPerInchYChanged(qreal dpi); + void logicalDotsPerInchChanged(qreal dpi); + void availableSizeChanged(const QSize &size); + void availableGeometryChanged(const QRect &rect); void currentOrientationChanged(Qt::ScreenOrientation orientation); private: |