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>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/platforms/windows/qwindowsscreen.h b/src/plugins/platforms/windows/qwindowsscreen.h
index 65ee865d5e..b424375694 100644
--- a/src/plugins/platforms/windows/qwindowsscreen.h
+++ b/src/plugins/platforms/windows/qwindowsscreen.h
@@ -56,8 +56,8 @@ struct QWindowsScreenData
 
     QRect geometry;
     QRect availableGeometry;
-    QPair<int, int> dpi;
-    QSize physicalSizeMM;
+    QDpi dpi;
+    QSizeF physicalSizeMM;
     int depth;
     QImage::Format format;
     bool primary;
@@ -74,7 +74,8 @@ public:
     virtual QRect availableGeometry() const { return m_data.availableGeometry; }
     virtual int depth() const { return m_data.depth; }
     virtual QImage::Format format() const { return m_data.format; }
-    virtual QSize physicalSize() const { return m_data.physicalSizeMM; }
+    virtual QSizeF physicalSize() const { return m_data.physicalSizeMM; }
+    virtual QDpi logicalDpi() const { return m_data.dpi; }
 
     virtual QWindow *topLevelAt(const QPoint &point) const
         {  return QWindowsScreen::findTopLevelAt(point, CWP_SKIPINVISIBLE);  }