diff options
| author | Axel Spoerl <axel.spoerl@qt.io> | 2024-04-11 08:19:52 +0000 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-04-13 07:24:54 +0000 |
| commit | 3e049f06557d0e3483b7fa40ecf8c9a918d8ac3a (patch) | |
| tree | f8149bdfe44af831af15f9e4b9a63d48432bd803 | |
| parent | 285294b684ac973efcf2c8ff92b427db3fb75948 (diff) | |
Revert "QStyleSheetStyle: Propagate CE_ItemViewItem drawing to baseStyle"
This reverts commit f39f2bfe0b216252980c082b1771540dd00e6bd6.
Reason for revert: Breaks styling of treeview indicators.
Pick-to: 6.7 6.6 6.5
Task-number: QTBUG-123632
Change-Id: I7922f58a9a1ace40ba788571a297443c1900baf2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 82a101f457..7602217f24 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -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 |