From be905c031db19bbe0f5dfc26cf26ef653c8b967d Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 30 May 2024 12:31:51 +0100 Subject: [PATCH] Only apply contrasting foreground colour if there is a background colour --- qrenderdoc/Widgets/Extended/RDTreeView.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/qrenderdoc/Widgets/Extended/RDTreeView.cpp b/qrenderdoc/Widgets/Extended/RDTreeView.cpp index e76534bd8..55532885f 100644 --- a/qrenderdoc/Widgets/Extended/RDTreeView.cpp +++ b/qrenderdoc/Widgets/Extended/RDTreeView.cpp @@ -774,9 +774,15 @@ void RDTreeView::drawBranches(QPainter *painter, const QRect &rect, const QModel opt.rect = allLinesRect; opt.showDecorationSelected = true; opt.backgroundBrush = index.data(Qt::BackgroundRole).value(); - QColor foreCol = index.data(Qt::ForegroundRole).value().color(); - opt.palette.setColor(QPalette::Foreground, foreCol); - opt.palette.setColor(QPalette::Text, foreCol); + QVariant foreColVar = index.data(Qt::ForegroundRole); + QColor foreCol; + + if(foreColVar.isValid()) + { + foreCol = foreColVar.value().color(); + opt.palette.setColor(QPalette::Foreground, foreCol); + opt.palette.setColor(QPalette::Text, foreCol); + } style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter, this); @@ -786,7 +792,8 @@ void RDTreeView::drawBranches(QPainter *painter, const QRect &rect, const QModel { // set the desired colour for RDTweakedNativeStyle via a huge hack - see // RDTweakedNativeStyle::drawPrimitive for QStyle::PE_IndicatorBranch - painter->setPen(QPen(foreCol, 1234.5)); + if(foreColVar.isValid()) + painter->setPen(QPen(foreCol, 1234.5)); QTreeView::drawBranches(painter, rect, index); } else