diff options
Diffstat (limited to 'src/gui/kernel/qplatformwindow.cpp')
| -rw-r--r-- | src/gui/kernel/qplatformwindow.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index 0430d5a4c6..ea3b75c81c 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -702,15 +702,20 @@ QRect QPlatformWindow::windowFrameGeometry() const a resize/move event for platforms that support it, for example to implement heightForWidth(). */ -QRectF QPlatformWindow::windowClosestAcceptableGeometry(const QRectF &nativeRect) const + +QRectF QPlatformWindow::closestAcceptableGeometry(const QWindow *qWindow, const QRectF &nativeRect) { - QWindow *qWindow = window(); const QRectF rectF = QHighDpi::fromNativePixels(nativeRect, qWindow); - const QRectF correctedGeometryF = qt_window_private(qWindow)->closestAcceptableGeometry(rectF); + const QRectF correctedGeometryF = qt_window_private(const_cast<QWindow *>(qWindow))->closestAcceptableGeometry(rectF); return !correctedGeometryF.isEmpty() && rectF != correctedGeometryF ? QHighDpi::toNativePixels(correctedGeometryF, qWindow) : nativeRect; } +QRectF QPlatformWindow::windowClosestAcceptableGeometry(const QRectF &nativeRect) const +{ + return QPlatformWindow::closestAcceptableGeometry(window(), nativeRect); +} + /*! \class QPlatformWindow \since 4.8 |