From 46039092bdabcea76f5899b492e3429d6b571bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Wed, 14 Apr 2021 19:59:22 +0200 Subject: Use QHighDpi::toNativeWindowGeometry() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This function implements the isTopLevel() logic, which we now don’t have to duplicate at each call site. Change-Id: Ic8b857aa7cd3c3c23d5e950d9f50b66c81ba3ccf Reviewed-by: Morten Johan Sørvig Reviewed-by: Tor Arne Vestbø --- src/gui/kernel/qwindow.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/gui/kernel/qwindow.cpp') diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 06ac63c9d9..e1733cbf46 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -1753,13 +1753,7 @@ void QWindow::setGeometry(const QRect &rect) QScreen *newScreen = d->screenForGeometry(rect); if (newScreen && isTopLevel()) d->setTopLevelScreen(newScreen, true); - - QRect nativeRect; - if (newScreen && isTopLevel()) - nativeRect = QHighDpi::toNativePixels(rect, newScreen); - else - nativeRect = QHighDpi::toNativeLocalPosition(rect, newScreen); - d->platformWindow->setGeometry(nativeRect); + d->platformWindow->setGeometry(QHighDpi::toNativeWindowGeometry(rect, this)); } else { d->geometry = rect; -- cgit v1.2.3