diff options
author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-04-14 12:56:48 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-04-14 12:58:24 +0200 |
commit | 91fb8061875db830d26f95acef048e36fb44cd6a (patch) | |
tree | 3718dd47863a56390b0918b88c6a8ef74c7a84dd /src/gui/kernel/qplatformscreen.cpp | |
parent | 7c77febbde4a7e2ebe73579f06baf018cbd192c3 (diff) |
Move qHighDpi functions into the QHighDpi namespace
...and use fromDevicePixels instead of toDeviceIndependentPixels
Diffstat (limited to 'src/gui/kernel/qplatformscreen.cpp')
-rw-r--r-- | src/gui/kernel/qplatformscreen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp index 1e14818c30..e2c84fbc2c 100644 --- a/src/gui/kernel/qplatformscreen.cpp +++ b/src/gui/kernel/qplatformscreen.cpp @@ -291,8 +291,8 @@ void QPlatformScreen::resizeMaximizedWindows() // 'screen()' still has the old geometry info while 'this' has the new geometry info const QRect oldGeometry = screen()->geometry(); const QRect oldAvailableGeometry = screen()->availableGeometry(); - const QRect newGeometry = qHighDpiToDeviceIndependentPixels(geometry()); - const QRect newAvailableGeometry = qHighDpiToDeviceIndependentPixels(availableGeometry()); + const QRect newGeometry = QHighDpi::fromDevicePixels(geometry()); + const QRect newAvailableGeometry = QHighDpi::fromDevicePixels(availableGeometry()); // make sure maximized and fullscreen windows are updated for (int i = 0; i < windows.size(); ++i) { @@ -396,12 +396,12 @@ QRect QPlatformScreen::mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation QRect QPlatformScreen::screenGeometry() const { - return qHighDpiToDevicePixels(screen()->geometry()); + return QHighDpi::toDevicePixels(screen()->geometry()); } QRect QPlatformScreen::screenAvailableGeometry() const { - return qHighDpiToDevicePixels(screen()->availableGeometry()); + return QHighDpi::toDevicePixels(screen()->availableGeometry()); } /*! |