From 3e049f06557d0e3483b7fa40ecf8c9a918d8ac3a Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Thu, 11 Apr 2024 08:19:52 +0000 Subject: 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 --- src/widgets/styles/qstylesheetstyle.cpp | 4 ++-- 1 file 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 -- cgit v1.2.3