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 <wladimir.leuschner@qt.io> (cherry picked from commit a930fb758d71ef6bf353e8fd8078de2335c32085) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
936992c404
commit
b7e0a7bfde
@ -1433,8 +1433,9 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
|
|||||||
break;
|
break;
|
||||||
case CE_PushButtonBevel:
|
case CE_PushButtonBevel:
|
||||||
if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(option)) {
|
if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(option)) {
|
||||||
|
QRectF rect = btn->rect.marginsRemoved(QMargins(2, 2, 2, 2));
|
||||||
|
painter->setPen(Qt::NoPen);
|
||||||
if (btn->features.testFlag(QStyleOptionButton::Flat)) {
|
if (btn->features.testFlag(QStyleOptionButton::Flat)) {
|
||||||
painter->setPen(Qt::NoPen);
|
|
||||||
painter->setBrush(btn->palette.button());
|
painter->setBrush(btn->palette.button());
|
||||||
painter->drawRoundedRect(rect, secondLevelRoundingRadius, secondLevelRoundingRadius);
|
painter->drawRoundedRect(rect, secondLevelRoundingRadius, secondLevelRoundingRadius);
|
||||||
if (flags & (State_Sunken | State_On)) {
|
if (flags & (State_Sunken | State_On)) {
|
||||||
@ -1445,8 +1446,6 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
|
|||||||
}
|
}
|
||||||
painter->drawRoundedRect(rect, secondLevelRoundingRadius, secondLevelRoundingRadius);
|
painter->drawRoundedRect(rect, secondLevelRoundingRadius, secondLevelRoundingRadius);
|
||||||
} else {
|
} else {
|
||||||
QRectF rect = btn->rect.marginsRemoved(QMargins(2,2,2,2));
|
|
||||||
painter->setPen(Qt::NoPen);
|
|
||||||
if (flags & (State_Sunken))
|
if (flags & (State_Sunken))
|
||||||
painter->setBrush(flags & State_On ? option->palette.accent().color().lighter(120) : WINUI3Colors[colorSchemeIndex][controlFillTertiary]);
|
painter->setBrush(flags & State_On ? option->palette.accent().color().lighter(120) : WINUI3Colors[colorSchemeIndex][controlFillTertiary]);
|
||||||
else if (flags & State_MouseOver)
|
else if (flags & State_MouseOver)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user