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/plugins/platforms/uikit | |
parent | 29948e666583a26966ddb97faf4808099824b80d (diff) |
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/plugins/platforms/uikit')
-rw-r--r-- | src/plugins/platforms/uikit/quikitscreen.h | 4 | ||||
-rw-r--r-- | src/plugins/platforms/uikit/quikitscreen.mm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/uikit/quikitscreen.h b/src/plugins/platforms/uikit/quikitscreen.h index 23e95f692b..bde4f89a1e 100644 --- a/src/plugins/platforms/uikit/quikitscreen.h +++ b/src/plugins/platforms/uikit/quikitscreen.h @@ -57,7 +57,7 @@ public: QRect geometry() const { return m_geometry; } int depth() const { return m_depth; } QImage::Format format() const { return m_format; } - QSize physicalSize() const { return m_physicalSize; } + QSizeF physicalSize() const { return m_physicalSize; } UIScreen *uiScreen() const; @@ -65,7 +65,7 @@ private: QRect m_geometry; int m_depth; QImage::Format m_format; - QSize m_physicalSize; + QSizeF m_physicalSize; int m_index; }; diff --git a/src/plugins/platforms/uikit/quikitscreen.mm b/src/plugins/platforms/uikit/quikitscreen.mm index 0a5b027b2b..b938542df4 100644 --- a/src/plugins/platforms/uikit/quikitscreen.mm +++ b/src/plugins/platforms/uikit/quikitscreen.mm @@ -67,7 +67,7 @@ QUIKitScreen::QUIKitScreen(int screenIndex) dpi = 132.; dragDistance = 10; } - m_physicalSize = QSize(qRound(bounds.size.width * inch / dpi), qRound(bounds.size.height * inch / dpi)); + m_physicalSize = QSizeF(bounds.size.width, bounds.size.height) * inch / dpi; qApp->setStartDragDistance(dragDistance); [pool release]; } |