diff options
| author | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-03-16 17:09:22 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-03-17 08:05:08 +0000 |
| commit | 5ab8440e2f121bb159c562b1149b5da58eed54e8 (patch) | |
| tree | 6e802df5fc9e3bf3ecbd9f69bbd96ebbdccff930 | |
| parent | cdbf1f5ab33fa7a51c9e9dbc04871536922326dc (diff) | |
| download | qt-creator-5ab8440e2f121bb159c562b1149b5da58eed54e8.tar.gz | |
ProgressBar: Add a theme color for the background
The progress bar is important and custom enough to deserve its own theme
color for the background. This change adds "ProgressBarBackgroundColor"
and also sets it for dark.cretatortheme, so that it has a good contrast
to ProgressBarColorNormal.
Change-Id: I37731d7a918a862a28940e215c913f9ade8569ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| -rw-r--r-- | share/qtcreator/themes/dark.creatortheme | 1 | ||||
| -rw-r--r-- | share/qtcreator/themes/darkframe.creatortheme | 1 | ||||
| -rw-r--r-- | share/qtcreator/themes/default.creatortheme | 1 | ||||
| -rw-r--r-- | src/libs/utils/theme/theme.h | 1 | ||||
| -rw-r--r-- | src/plugins/coreplugin/progressmanager/progressbar.cpp | 2 |
5 files changed, 5 insertions, 1 deletions
diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index ea9777c944..761b0e4439 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -92,6 +92,7 @@ ProgressBarColorError=error ProgressBarColorFinished=ff5aaa3c ProgressBarColorNormal=ff808080 ProgressBarTitleColor=text +ProgressBarBackgroundColor=normalBackground SplitterColor=ff313131 TextColorDisabled=textDisabled TextColorError=ffff4040 diff --git a/share/qtcreator/themes/darkframe.creatortheme b/share/qtcreator/themes/darkframe.creatortheme index 7b8e6067e5..7ba032d41f 100644 --- a/share/qtcreator/themes/darkframe.creatortheme +++ b/share/qtcreator/themes/darkframe.creatortheme @@ -94,6 +94,7 @@ ProgressBarColorError=ffdb6f71 ProgressBarColorFinished=dda4d576 ProgressBarColorNormal=ff999999 ProgressBarTitleColor=toolBarItem +ProgressBarBackgroundColor=a0606060 SplitterColor=splitter TextColorDisabled=textDisabled TextColorError=ffff4040 diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index d373839cbb..04bb840388 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -86,6 +86,7 @@ ProgressBarColorError=d2ff3c00 ProgressBarColorFinished=ff5aaa3c ProgressBarColorNormal=b4ffffff ProgressBarTitleColor=ffffffff +ProgressBarBackgroundColor=18ffffff SplitterColor=ff151515 TextColorDisabled=ff000000 TextColorError=ffff0000 diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index d674e0d1a5..9c2b92c620 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -112,6 +112,7 @@ public: ProgressBarColorFinished, ProgressBarColorNormal, ProgressBarTitleColor, + ProgressBarBackgroundColor, SplitterColor, TextColorDisabled, TextColorError, diff --git a/src/plugins/coreplugin/progressmanager/progressbar.cpp b/src/plugins/coreplugin/progressmanager/progressbar.cpp index 97c98bc495..f683b44a60 100644 --- a/src/plugins/coreplugin/progressmanager/progressbar.cpp +++ b/src/plugins/coreplugin/progressmanager/progressbar.cpp @@ -300,7 +300,7 @@ void ProgressBar::paintEvent(QPaintEvent *) //draw the progress bar if (creatorTheme()->widgetStyle() == Theme::StyleFlat) { p.fillRect(rect.adjusted(2, 2, -2, -2), - creatorTheme()->color(Theme::FancyToolButtonHoverColor)); + creatorTheme()->color(Theme::ProgressBarBackgroundColor)); p.fillRect(inner, c); } else { const static QImage bar(StyleHelper::dpiSpecificImageFile( |