diff options
| author | Jochen Seemann <seeman.jochen@gmail.com> | 2014-07-25 16:03:18 +0300 |
|---|---|---|
| committer | Andrew Knight <andrew.knight@digia.com> | 2014-08-05 16:43:52 +0200 |
| commit | fcb8dc0cb92f9cf689bfae4d5fff55d63ca4accb (patch) | |
| tree | a47097d8187e960a6fbdada041b6ee9829c9b9a2 /src/plugins/platforms/winrt | |
| parent | 42f681ea8db8330c1992fc85669206efab5ab562 (diff) | |
WinRT: Fix physical size of screen
Currently, the physical size of the screen is calculated with the
logicalSize and the logicalDpi of the screen. This doesn't work because
logicalDpi has a user-defined multiplier and a strange value.
The easiest and accuratest way is to take the raw dpi of the axis and
the raw pixel size (logicalSize*scaleFactor).
This all is needed for a correct value
of Screen.pixelDensity in QtQuick.
Change-Id: I8be0139d762364140043c3fa0d203298ca7ef293
Reviewed-by: Jochen Seemann <seemann.jochen@gmail.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Diffstat (limited to 'src/plugins/platforms/winrt')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtscreen.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp index 1a263719b5..c366babebc 100644 --- a/src/plugins/platforms/winrt/qwinrtscreen.cpp +++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp @@ -448,6 +448,7 @@ public: QSizeF logicalSize; QSurfaceFormat surfaceFormat; qreal logicalDpi; + QDpi physicalDpi; qreal scaleFactor; Qt::ScreenOrientation nativeOrientation; Qt::ScreenOrientation orientation; @@ -629,7 +630,8 @@ QSurfaceFormat QWinRTScreen::surfaceFormat() const QSizeF QWinRTScreen::physicalSize() const { Q_D(const QWinRTScreen); - return d->logicalSize / d->logicalDpi * qreal(25.4); + return QSizeF(d->logicalSize.width() * d->scaleFactor / d->physicalDpi.first * qreal(25.4), + d->logicalSize.height() * d->scaleFactor / d->physicalDpi.second * qreal(25.4)); } QDpi QWinRTScreen::logicalDpi() const @@ -1137,6 +1139,14 @@ HRESULT QWinRTScreen::onDpiChanged(IDisplayInformation *, IInspectable *) RETURN_OK_IF_FAILED("Failed to get logical DPI."); d->logicalDpi = dpi; + hr = d->displayInformation->get_RawDpiX(&dpi); + RETURN_OK_IF_FAILED("Failed to get x raw DPI."); + d->physicalDpi.first = dpi ? dpi : 96.0; + + hr = d->displayInformation->get_RawDpiY(&dpi); + RETURN_OK_IF_FAILED("Failed to get y raw DPI."); + d->physicalDpi.second = dpi ? dpi : 96.0; + return S_OK; } |