diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-06-10 14:27:22 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-06-10 13:03:24 +0000 |
| commit | ac2a44c716d84979747e166f43129e59612e1a97 (patch) | |
| tree | bafaaeeeddcdb8744100fb7c3498b871c05241da /src/gui/kernel/qplatformwindow.cpp | |
| parent | 34e06b48678b60716d614281898fd4e18fb4d586 (diff) | |
Add QPlatformWindow::windowClosestAcceptableGeometry().
Add a function to determine the closest acceptable geometry
(height-for-width) to QPlatformWindow similar to the existing
QPlatformWindow::windowMinimumSize(), windowMaximumSize()...
Clean up the hack in the Windows platform plugin accordingly.
Change-Id: I96e943cfdbafdd0ff444e0d53ee0bdf8603d33df
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'src/gui/kernel/qplatformwindow.cpp')
| -rw-r--r-- | src/gui/kernel/qplatformwindow.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index 34a1fabc76..9217aca400 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -690,6 +690,20 @@ QRect QPlatformWindow::windowGeometry() const } /*! + Returns the closest acceptable geometry for a given geometry before + a resize/move event for platforms that support it, for example to + implement heightForWidth(). +*/ +QRectF QPlatformWindow::windowClosestAcceptableGeometry(const QRectF &nativeRect) const +{ + QWindow *qWindow = window(); + const QRectF rectF = QHighDpi::fromNativePixels(nativeRect, qWindow); + const QRectF correctedGeometryF = qt_window_private(qWindow)->closestAcceptableGeometry(rectF); + return !correctedGeometryF.isEmpty() && rectF != correctedGeometryF + ? QHighDpi::toNativePixels(correctedGeometryF, qWindow) : nativeRect; +} + +/*! \class QPlatformWindow \since 4.8 \internal |