1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows QPA: Include custom margins in atypical margins

Browse Source 
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 <david.faure@kdab.com>
(cherry picked from commit 82e8f9e4571c50be476f8e38f9239c5b0c6be32c)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Timothée Keller 2024-01-09 15:52:50 +01:00 committed by Volker Hilsheimer
parent bcc5817614
commit acb5a72ef0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -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);
}