diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-11-23 14:58:54 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2015-02-10 15:32:49 +0000 |
| commit | 59fc0fe8f2f5843d961ea5ae8967eb15850e9231 (patch) | |
| tree | ebf2b4905dc3c17442cf09a837b438d56f5d8024 | |
| parent | d95775a54cc100b3c2b9522653885f3c51dd8e1c (diff) | |
| download | qt-creator-59fc0fe8f2f5843d961ea5ae8967eb15850e9231.tar.gz | |
Theming: Fix highlighting of focused widget in target selector
Change-Id: I477a409ed231a291fb9320ce9014853a7e21274c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
| -rw-r--r-- | src/libs/utils/theme/theme.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/miniprojecttargetselector.cpp | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/utils/theme/theme.cpp b/src/libs/utils/theme/theme.cpp index 3fd18c77c6..2e85c8c084 100644 --- a/src/libs/utils/theme/theme.cpp +++ b/src/libs/utils/theme/theme.cpp @@ -354,6 +354,7 @@ QPalette Theme::palette() const pal.setBrush(QPalette::ButtonText, color(Theme::TextColorNormal)); pal.setBrush(QPalette::ToolTipBase, color(Theme::BackgroundColorSelected)); pal.setColor(QPalette::Highlight, color(Theme::BackgroundColorSelected)); + pal.setColor(QPalette::Dark, color(Theme::BackgroundColorDark)); pal.setColor(QPalette::HighlightedText, Qt::white); pal.setColor(QPalette::ToolTipText, color(Theme::TextColorNormal)); return pal; diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index b65d128c7e..da885b141a 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -135,12 +135,12 @@ void TargetSelectorDelegate::paint(QPainter *painter, selectionGradient.load(QLatin1String(":/projectexplorer/images/targetpanel_gradient.png")); if (option.state & QStyle::State_Selected) { + const QColor color = (option.state & QStyle::State_HasFocus) ? + option.palette.highlight().color() : + option.palette.dark().color(); if (creatorTheme()->widgetStyle() == Theme::StyleFlat) { - painter->fillRect(option.rect, creatorTheme()->color(Theme::BackgroundColorSelected)); + painter->fillRect(option.rect, color); } else { - QColor color =(option.state & QStyle::State_HasFocus) ? - option.palette.highlight().color() : - option.palette.dark().color(); painter->fillRect(option.rect, color.darker(140)); Utils::StyleHelper::drawCornerImage(selectionGradient, painter, option.rect.adjusted(0, 0, 0, -1), 5, 5, 5, 5); painter->setPen(QColor(255, 255, 255, 60)); |