From acb5a72ef0f48c3b48ae81388580fd8a9a38fd77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Keller?= Date: Tue, 9 Jan 2024 15:52:50 +0100 Subject: [PATCH] Windows QPA: Include custom margins in atypical margins When calculating atypical margins that are used with ExtendsContentIntoTitleBar, the margins were checked against systemmargins, and then custom margins were added later. Instead, add the custom margins immediately and take them into account during calculations. Pick-to: 6.7.0 6.6 6.5 Change-Id: I44af663c85b8bdf080d769e3b38431cbe5df64f3 Reviewed-by: David Faure (cherry picked from commit 82e8f9e4571c50be476f8e38f9239c5b0c6be32c) Reviewed-by: Volker Hilsheimer --- src/plugins/platforms/windows/qwindowswindow.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index c2c093faf4a..220c36cc192 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -2808,15 +2808,16 @@ void QWindowsWindow::calculateFullFrameMargins() const auto systemMargins = testFlag(DisableNonClientScaling) ? QWindowsGeometryHint::frameOnPrimaryScreen(window(), m_data.hwnd) : frameMargins_sys(); + const QMargins actualMargins = systemMargins + customMargins(); const int yDiff = (windowRect.bottom - windowRect.top) - (clientRect.bottom - clientRect.top); - const bool typicalFrame = (systemMargins.left() == systemMargins.right()) - && (systemMargins.right() == systemMargins.bottom()); + const bool typicalFrame = (actualMargins.left() == actualMargins.right()) + && (actualMargins.right() == actualMargins.bottom()); const QMargins adjustedMargins = typicalFrame ? - QMargins(systemMargins.left(), (yDiff - systemMargins.bottom()), - systemMargins.right(), systemMargins.bottom()) - : systemMargins + customMargins(); + QMargins(actualMargins.left(), (yDiff - actualMargins.bottom()), + actualMargins.right(), actualMargins.bottom()) + : actualMargins; setFullFrameMargins(adjustedMargins); }