feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Theming: Fix highlighting of focused widget in target selector

Browse Source 
Change-Id: I477a409ed231a291fb9320ce9014853a7e21274c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2014-11-23 14:58:54 +02:00
committed by Orgad Shaneh
parent d95775a54c
commit 59fc0fe8f2
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/utils/theme/theme.cpp
View File

@@ -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;

8
src/plugins/projectexplorer/miniprojecttargetselector.cpp
View File

@@ -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));