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

Stylesheet: Another positioning fix for the menu indicator

Browse Source 
Draw tool button menu indicator relative to frame, not content, so that
padding added in the stylesheet creates room between text and indicator.

Also, prevent another double-arrow by ignoring menu indicator rendering
when a menu button subcontrol is used, as the two are mutually
exclusive. This amends 1c338e6d07a42631a6603c5bb0bc86f6806addd6.

Add problematic case to stylesheet baseline test.

Fixes: QTBUG-102866
Change-Id: I5d79e65b33a2e41ac07c8efe0c15697c5be65201
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
(cherry picked from commit 9d41bd431280d7bb1f0fa3865e49a13200ff9608)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2022-05-17 04:15:12 +02:00 committed by Qt Cherry-pick Bot
parent 042c1b94d0
commit 90e14f94c3
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -3316,7 +3316,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
if (customDropDownArrow)
toolOpt.features &= ~(QStyleOptionToolButton::Menu | QStyleOptionToolButton::HasMenu);
}
const bool customMenuIndicator = (!customDropDown && drawMenuIndicator)
const bool customMenuIndicator = (!drawDropDown && drawMenuIndicator)
&& hasStyleRule(w, PseudoElement_ToolButtonMenuIndicator);
if (customMenuIndicator)
toolOpt.features &= ~QStyleOptionToolButton::HasMenu;
@ -3388,9 +3388,9 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
} else if (drawMenuIndicator) {
QRenderRule subRule = renderRule(w, opt, PseudoElement_ToolButtonMenuIndicator);
QRect r = subRule.hasGeometry() || subRule.hasPosition()
? positionRect(w, subRule, PseudoElement_ToolButtonMenuIndicator, toolOpt.rect, toolOpt.direction)
: subRule.contentsRect(opt->rect);
// content padding does not impact the indicator, so use the original rect to
// calculate position of the sub element within the toplevel rule
QRect r = positionRect(w, rule, subRule, PseudoElement_ToolButtonMenuIndicator, opt->rect, toolOpt.direction);
if (subRule.hasDrawable()) {
subRule.drawRule(p, r);
} else {
@ -3431,7 +3431,6 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
}
subRule.drawRule(p, arrowRect);
}
return;
}
break;

12
tests/baseline/stylesheet/qss/qtoolbutton/menuButton_subcontrol_padding.qss Normal file
View File

@ -0,0 +1,12 @@
QToolButton {
border: 5px solid #9e9e9e;
background: #ffffff;
padding-top: 8px;
padding-bottom: 8px;
}
QToolButton[popupMode=InstantPopup] {
padding-right: 75px;
}
QToolButton::menu-indicator {
subcontrol-position: right;
};