From 4bc38f11012471ce43a83e3d726815f35c7b2896 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 19 Dec 2019 17:46:17 +0100 Subject: [PATCH] ProjectListWidget: Improve MiniProjectTargetSelector theming In order to support theme tinting, Use Utils::StyleHelper().baseColor() instead of MiniProjectTargetSelectorBackgroundColor and MiniProjectTargetSelectorSummaryBackgroundColor roles. Also QPalette instead of a style sheet. The above two theming roles are marked for deprecation. Change-Id: Ia9688a617056adbf55c64373d08f9e15ecc5af1f Reviewed-by: Tobias Hunger --- src/libs/utils/theme/theme.h | 4 ++-- src/plugins/projectexplorer/miniprojecttargetselector.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index f350bf0ca25..811f86ce18d 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -96,9 +96,9 @@ public: MenuBarItemTextColorNormal, MenuItemTextColorDisabled, MenuItemTextColorNormal, - MiniProjectTargetSelectorBackgroundColor, + MiniProjectTargetSelectorBackgroundColor, // TODO: Deprecate. -> Utils::StyleHelper().baseColor() MiniProjectTargetSelectorBorderColor, - MiniProjectTargetSelectorSummaryBackgroundColor, + MiniProjectTargetSelectorSummaryBackgroundColor, // TODO: Deprecate. -> Utils::StyleHelper().baseColor() MiniProjectTargetSelectorTextColor, OutputPaneButtonFlashColor, OutputPaneToggleButtonTextColorChecked, diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 217d9d3be87..04da9b0ca3c 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -723,8 +723,9 @@ MiniProjectTargetSelector::MiniProjectTargetSelector(QAction *targetSelectorActi m_summaryLabel = new QLabel(this); m_summaryLabel->setContentsMargins(3, 3, 3, 3); m_summaryLabel->setAlignment(Qt::AlignLeft | Qt::AlignTop); - m_summaryLabel->setStyleSheet(QString::fromLatin1("background: %1;") - .arg(creatorTheme()->color(Theme::MiniProjectTargetSelectorSummaryBackgroundColor).name())); + QPalette pal = m_summaryLabel->palette(); + pal.setColor(QPalette::Window, Utils::StyleHelper().baseColor()); + m_summaryLabel->setPalette(pal); m_summaryLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); m_summaryLabel->setTextInteractionFlags(m_summaryLabel->textInteractionFlags() | Qt::LinksAccessibleByMouse); @@ -1628,8 +1629,7 @@ void MiniProjectTargetSelector::updateSummary() void MiniProjectTargetSelector::paintEvent(QPaintEvent *) { QPainter painter(this); - painter.setBrush(creatorTheme()->color(Theme::MiniProjectTargetSelectorBackgroundColor)); - painter.drawRect(rect()); + painter.fillRect(rect(), Utils::StyleHelper().baseColor()); painter.setPen(creatorTheme()->color(Theme::MiniProjectTargetSelectorBorderColor)); // draw border on top and right QRectF borderRect = QRectF(rect()).adjusted(0.5, 0.5, -0.5, -0.5);