From b7e0a7bfdebfcce46084164c971ad6ab9363184f Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Mon, 23 Dec 2024 18:23:03 +0100 Subject: [PATCH] Windows11Style: adjust size of flat buttons Flat buttons were larger than normal buttons - therefore also add marginsRemove(QMargins(2,2,2,2) for the flat case too. Pick-to: 6.8 Task-number: QTBUG-132433 Change-Id: Id010d45bf85c5d7d09ff8db8bda44b1be7d85297 Reviewed-by: Wladimir Leuschner (cherry picked from commit a930fb758d71ef6bf353e8fd8078de2335c32085) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/styles/modernwindows/qwindows11style.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/styles/modernwindows/qwindows11style.cpp b/src/plugins/styles/modernwindows/qwindows11style.cpp index 9dee9363223..f73d5480768 100644 --- a/src/plugins/styles/modernwindows/qwindows11style.cpp +++ b/src/plugins/styles/modernwindows/qwindows11style.cpp @@ -1433,8 +1433,9 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op break; case CE_PushButtonBevel: if (const QStyleOptionButton *btn = qstyleoption_cast(option)) { + QRectF rect = btn->rect.marginsRemoved(QMargins(2, 2, 2, 2)); + painter->setPen(Qt::NoPen); if (btn->features.testFlag(QStyleOptionButton::Flat)) { - painter->setPen(Qt::NoPen); painter->setBrush(btn->palette.button()); painter->drawRoundedRect(rect, secondLevelRoundingRadius, secondLevelRoundingRadius); if (flags & (State_Sunken | State_On)) { @@ -1445,8 +1446,6 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op } painter->drawRoundedRect(rect, secondLevelRoundingRadius, secondLevelRoundingRadius); } else { - QRectF rect = btn->rect.marginsRemoved(QMargins(2,2,2,2)); - painter->setPen(Qt::NoPen); if (flags & (State_Sunken)) painter->setBrush(flags & State_On ? option->palette.accent().color().lighter(120) : WINUI3Colors[colorSchemeIndex][controlFillTertiary]); else if (flags & State_MouseOver)