diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-05-27 10:57:08 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-10-20 07:26:24 +0200 |
| commit | 95bce5b185ddc736405a952b9132e5c8f51275aa (patch) | |
| tree | 0f3c542dade9d5dbfa7aaec86591159d55221c41 /src/gui/kernel/qwindowsysteminterface.cpp | |
| parent | 73a93981ca6bd641f2c75faf3cdce1fa0711fbb5 (diff) | |
QHighDpi: window geometry scaling functions
Add functions which scales window geometry:
framNativeWindowGeometry()
toNativeWindowGeometry()
These correctly handles top-level and child windows,
where top-level window positions scale around the screen
origin while child window positions scale around (0, 0).
Modify call cites to use the new functions. We no longer
need the isTopLevel checks at the call site.
Change-Id: I0158672d46a3f52dfc7d37d021fc5cebd7859200
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/kernel/qwindowsysteminterface.cpp')
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index b32d9d9926..14c071b4d9 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -300,18 +300,14 @@ QWindowSystemInterfacePrivate::GeometryChangeEvent::GeometryChangeEvent(QWindow { if (const QPlatformWindow *pw = window->handle()) { const auto nativeGeometry = pw->QPlatformWindow::geometry(); - requestedGeometry = window->isTopLevel() - ? QHighDpi::fromNativePixels(nativeGeometry, window) - : QHighDpi::fromNativeLocalPosition(nativeGeometry, window); + requestedGeometry = QHighDpi::fromNativeWindowGeometry(nativeGeometry, window); } } QT_DEFINE_QPA_EVENT_HANDLER(void, handleGeometryChange, QWindow *window, const QRect &newRect) { Q_ASSERT(window); - const auto newRectDi = window->isTopLevel() - ? QHighDpi::fromNativePixels(newRect, window) - : QHighDpi::fromNativeLocalPosition(newRect, window); + const auto newRectDi = QHighDpi::fromNativeWindowGeometry(newRect, window); auto e = new QWindowSystemInterfacePrivate::GeometryChangeEvent(window, newRectDi); if (window->handle()) { // Persist the new geometry so that QWindow::geometry() can be queried in the resize event |