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

Revert "QStyleSheetStyle: Propagate CE_ItemViewItem drawing to baseStyle"

Browse Source 
This reverts commit f39f2bfe0b216252980c082b1771540dd00e6bd6.

Reason for revert: Breaks styling of treeview indicators.

Pick-to: 6.6 6.5
Task-number: QTBUG-123632
Change-Id: I7922f58a9a1ace40ba788571a297443c1900baf2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 3e049f06557d0e3483b7fa40ecf8c9a918d8ac3a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Axel Spoerl 2024-04-11 08:19:52 +00:00 committed by Qt Cherry-pick Bot
parent a49960be79
commit 69c68571db
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4368,7 +4368,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
if (subRule.hasDrawable()) {
subRule.configurePalette(&optCopy.palette, vopt->state & QStyle::State_Selected ? QPalette::HighlightedText : QPalette::Text,
vopt->state & QStyle::State_Selected ? QPalette::Highlight : QPalette::Base);
baseStyle()->drawControl(ce, &optCopy, p, w);
QWindowsStyle::drawControl(ce, &optCopy, p, w);
} else {
p->save();
if (hasStyleRule(w, PseudoElement_Indicator)) {
@ -4387,7 +4387,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
optIndicator.backgroundBrush = Qt::NoBrush; // no background
optIndicator.text.clear();
optIndicator.icon = QIcon();
baseStyle()->drawControl(ce, &optIndicator, p, w);
QWindowsStyle::drawControl(ce, &optIndicator, p, w);
// Now draw text, background,icon, and highlight, but not the indicator with
// the base style. Since we can't turn off HasCheckIndicator to prevent the base