whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate double arrow in QToolButton 

- InstantPopup mode is set and
- application uses a stylesheet that does not apply to QToolButton

Task-number: QTBUG-100401
Pick-to: 6.3 6.2
Change-Id: Iadf752ad9280d59763f4efc1938927a9b83e6ad9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Axel Spoerl 2022-02-11 14:01:27 +01:00
parent 8de0493896
commit ea0e0a8652
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3306,18 +3306,18 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
toolOpt.features &= ~QStyleOptionToolButton::Arrow;
toolOpt.text = QString(); // we need to draw the arrow and the text ourselves
}
const bool drawDropDown = tool->features & QStyleOptionToolButton::MenuButtonPopup;
bool drawDropDown = tool->features & QStyleOptionToolButton::MenuButtonPopup;
bool customDropDown = drawDropDown && hasStyleRule(w, PseudoElement_ToolButtonMenu);
bool customDropDownArrow = false;
const bool drawMenuIndicator = tool->features & QStyleOptionToolButton::HasMenu;
bool drawMenuIndicator = tool->features & QStyleOptionToolButton::HasMenu;
if (customDropDown) {
toolOpt.subControls &= ~QStyle::SC_ToolButtonMenu;
customDropDownArrow = hasStyleRule(w, PseudoElement_ToolButtonMenuArrow);
if (customDropDownArrow)
toolOpt.features &= ~(QStyleOptionToolButton::Menu | QStyleOptionToolButton::HasMenu);
}
bool customMenuIndicator = (!customDropDown && drawMenuIndicator)
&& hasStyleRule(w, PseudoElement_ToolButtonMenuIndicator);
const bool customMenuIndicator = (!customDropDown && drawMenuIndicator)
&& hasStyleRule(w, PseudoElement_ToolButtonMenuIndicator);
if (customMenuIndicator)
toolOpt.features &= ~QStyleOptionToolButton::HasMenu;
@ -3335,11 +3335,18 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
rule.drawBackground(p, toolOpt.rect);
}
// Let base or windows style draw the button
// set drawDropDown and drawMenuIndicator flags to false,
// unless customDropDownArrow needs to be drawn
if (rule.baseStyleCanDraw() && !(tool->features & QStyleOptionToolButton::Arrow)) {
baseStyle()->drawComplexControl(cc, &toolOpt, p, w);
} else {
QWindowsStyle::drawComplexControl(cc, &toolOpt, p, w);
}
if (!customDropDownArrow) {
drawDropDown = false;
drawMenuIndicator = false;
}
} else {
rule.drawRule(p, opt->rect);
toolOpt.rect = rule.contentsRect(opt->rect);
@ -3349,6 +3356,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
}
const QRect cr = toolOpt.rect;
// Draw DropDownButton unless drawn before
if (drawDropDown) {
if (opt->subControls & QStyle::SC_ToolButtonMenu) {
QRenderRule subRule = renderRule(w, opt, PseudoElement_ToolButtonMenu);