diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-30 14:25:43 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-06 09:36:39 +0200 |
| commit | 7d2cfbe5aa1e67d12010a66481625c9d40f0c174 (patch) | |
| tree | 26734132827c40ba425d79481c2c4193bac5c5ea /src/gui/kernel/qscreen.h | |
| parent | 29948e666583a26966ddb97faf4808099824b80d (diff) | |
| download | qtbase-7d2cfbe5aa1e67d12010a66481625c9d40f0c174.tar.gz | |
Improved logical and physical DPI APIs.
Made physicalSize() return QSizeF instead, to prevent rounding errors.
Added logicalSize() as the base to compute font pixel sizes instead, and
added convenience functions in QScreen to access the logical and
physical sizes and DPI metrics.
Task-number: QTBUG-21736
Task-number: QTBUG-21737
Change-Id: Ic705dc98eb3632617659e65a0c9a552673dc0c65
Reviewed-on: http://codereview.qt-project.org/5888
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/gui/kernel/qscreen.h')
| -rw-r--r-- | src/gui/kernel/qscreen.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/gui/kernel/qscreen.h b/src/gui/kernel/qscreen.h index ea068cd834..72681eb6da 100644 --- a/src/gui/kernel/qscreen.h +++ b/src/gui/kernel/qscreen.h @@ -44,6 +44,9 @@ #include <QtCore/QList> #include <QtCore/QObject> +#include <QtCore/QRect> +#include <QtCore/QSize> +#include <QtCore/QSizeF> QT_BEGIN_HEADER @@ -54,7 +57,6 @@ QT_MODULE(Gui) class QPlatformScreen; class QScreenPrivate; class QWindow; -class QSize; class QRect; class Q_GUI_EXPORT QScreen : public QObject @@ -72,6 +74,14 @@ public: QSize size() const; QRect geometry() const; + QSizeF physicalSize() const; + + qreal physicalDotsPerInchX() const; + qreal physicalDotsPerInchY() const; + + qreal logicalDotsPerInchX() const; + qreal logicalDotsPerInchY() const; + QSize availableSize() const; QRect availableGeometry() const; |