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

Theming: Add a Color value for splitter

Browse Source 
Used BackgroundColorSelected as a workaround in 3.3 in order to
maintain BC.

Change-Id: I1520deb8adcfed26b65aa7f4612218d15c310923
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-11 11:42:41 +02:00
committed by Eike Ziller
parent e717a75e38
commit ed7c287f50
4 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/themes/dark.creatortheme
View File

@@ -66,6 +66,7 @@ ProgressBarColorError=error
ProgressBarColorFinished=ff5aaa3c ProgressBarColorFinished=ff5aaa3c
ProgressBarColorNormal=hoverBackground ProgressBarColorNormal=hoverBackground
ProgressBarTitleColor=text ProgressBarTitleColor=text
SplitterColor=ffb0b0b0
TextColorDisabled=textDisabled TextColorDisabled=textDisabled
TextColorHighlight=ffff0000 TextColorHighlight=ffff0000
TextColorNormal=text TextColorNormal=text

1
share/qtcreator/themes/default.creatortheme
View File

@@ -60,6 +60,7 @@ ProgressBarColorError=d2ff3c00
ProgressBarColorFinished=ff5aaa3c ProgressBarColorFinished=ff5aaa3c
ProgressBarColorNormal=b4ffffff ProgressBarColorNormal=b4ffffff
ProgressBarTitleColor=ffffffff ProgressBarTitleColor=ffffffff
SplitterColor=ff151515
TextColorDisabled=ff000000 TextColorDisabled=ff000000
TextColorHighlight=ffa0a0a4 TextColorHighlight=ffa0a0a4
TextColorNormal=ff000000 TextColorNormal=ff000000

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

@@ -114,6 +114,7 @@ public:
ProgressBarColorFinished, ProgressBarColorFinished,
ProgressBarColorNormal, ProgressBarColorNormal,
ProgressBarTitleColor, ProgressBarTitleColor,
SplitterColor,
TextColorDisabled, TextColorDisabled,
TextColorHighlight, TextColorHighlight,
TextColorNormal, TextColorNormal,

2
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -620,7 +620,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
switch (element) { switch (element) {
case CE_Splitter: case CE_Splitter:
if (creatorTheme()->widgetStyle() == Theme::StyleFlat) if (creatorTheme()->widgetStyle() == Theme::StyleFlat)
painter->fillRect(option->rect, creatorTheme()->color(Theme::BackgroundColorSelected)); painter->fillRect(option->rect, creatorTheme()->color(Theme::SplitterColor));
else else
painter->fillRect(option->rect, StyleHelper::borderColor()); painter->fillRect(option->rect, StyleHelper::borderColor());
break; break;