From 7d2cfbe5aa1e67d12010a66481625c9d40f0c174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Fri, 30 Sep 2011 14:25:43 +0200 Subject: 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 Reviewed-by: Friedemann Kleint --- src/plugins/platforms/windows/qwindowsscreen.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/windows/qwindowsscreen.h') 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 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); } -- cgit v1.2.3