From 18c8fefc8dc86cdf633cc6adaf83d5388a5f96f7 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 13 Oct 2015 16:12:41 +0200 Subject: [PATCH] MiniProjectTargetSelector: Merge palette setup code Change-Id: I899ba5e7b7d2a128580f302937274e617c084cf6 Reviewed-by: Daniel Teske --- .../projectexplorer/miniprojecttargetselector.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index ccde03301c4..7d2b2e509c0 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -552,12 +552,6 @@ KitAreaWidget::KitAreaWidget(QWidget *parent) : QWidget(parent), m_layout->setMargin(3); setAutoFillBackground(true); connect(KitManager::instance(), &KitManager::kitUpdated, this, &KitAreaWidget::updateKit); - - QPalette p = palette(); - p.setColor(QPalette::Window, creatorTheme()->color(Theme::MiniProjectTargetSelectorSummaryBackgroundColor).name()); - p.setColor(QPalette::Button, creatorTheme()->color(Theme::MiniProjectTargetSelectorSummaryBackgroundColor).name()); - p.setColor(QPalette::ButtonText, creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor).name()); - setPalette(p); } KitAreaWidget::~KitAreaWidget() @@ -662,11 +656,12 @@ MiniProjectTargetSelector::MiniProjectTargetSelector(QAction *targetSelectorActi m_hideOnRelease(false) { QPalette p; - p.setColor(QPalette::Text, creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor)); p.setColor(QPalette::Foreground, creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor)); + p.setColor(QPalette::Text, creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor)); p.setColor(QPalette::ButtonText, creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor)); - p.setColor(QPalette::Background, creatorTheme()->color(Theme::MiniProjectTargetSelectorBackgroundColor)); + p.setColor(QPalette::Background, creatorTheme()->color(Theme::MiniProjectTargetSelectorSummaryBackgroundColor)); p.setColor(QPalette::Base, creatorTheme()->color(Theme::MiniProjectTargetSelectorSummaryBackgroundColor)); + p.setColor(QPalette::Button, creatorTheme()->color(Theme::MiniProjectTargetSelectorSummaryBackgroundColor).name()); setPalette(p); setProperty("panelwidget", true);