diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2016-07-21 17:14:52 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2016-07-22 11:11:56 +0000 |
| commit | 2a765db3a50210d9b242518b4a465a8f175e7065 (patch) | |
| tree | 4e511571d2b19bf8b2e18eb47a1a2b4b69cfc7e5 | |
| parent | 4f13735e2b006ef19ad1fad3f8eef639baa52a82 (diff) | |
| download | qt-creator-2a765db3a50210d9b242518b4a465a8f175e7065.tar.gz | |
Fix text color of progress/find status summary label
Using a themed text color instead of a hard-coded one and making sure
that ManhattanStyle does not tweak it.
Task-number: QTCREATORBUG-16643
Change-Id: I4bac9b29ee3c293270f39438664d617ac7591c8e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/libs/utils/stylehelper.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/buildprogress.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/texteditor/basefilefind.cpp | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp index 046ab11e12..1dfe1d89dd 100644 --- a/src/libs/utils/stylehelper.cpp +++ b/src/libs/utils/stylehelper.cpp @@ -93,10 +93,9 @@ QColor StyleHelper::notTooBrightHighlightColor() QPalette StyleHelper::sidebarFontPalette(const QPalette &original) { QPalette palette = original; - palette.setColor(QPalette::Active, QPalette::Text, panelTextColor()); - palette.setColor(QPalette::Active, QPalette::WindowText, panelTextColor()); - palette.setColor(QPalette::Inactive, QPalette::Text, panelTextColor().darker()); - palette.setColor(QPalette::Inactive, QPalette::WindowText, panelTextColor().darker()); + const QColor textColor = creatorTheme()->color(Theme::ProgressBarTitleColor); + palette.setColor(QPalette::WindowText, textColor); + palette.setColor(QPalette::Text, textColor); return palette; } diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp index f42790b7ff..256ec44d8a 100644 --- a/src/plugins/projectexplorer/buildprogress.cpp +++ b/src/plugins/projectexplorer/buildprogress.cpp @@ -34,6 +34,7 @@ #include <QLabel> #include <QHBoxLayout> #include <QPixmap> +#include <QVariant> #include <QVBoxLayout> using namespace ProjectExplorer; @@ -79,6 +80,8 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation m_warningLabel->setFont(f); m_errorLabel->setPalette(Utils::StyleHelper::sidebarFontPalette(m_errorLabel->palette())); m_warningLabel->setPalette(Utils::StyleHelper::sidebarFontPalette(m_warningLabel->palette())); + m_errorLabel->setProperty("_q_custom_style_disabled", QVariant(true)); + m_warningLabel->setProperty("_q_custom_style_disabled", QVariant(true)); m_errorIcon->setAlignment(Qt::AlignRight); m_warningIcon->setAlignment(Qt::AlignRight); diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 66d1e1f445..7a791d40b9 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -471,6 +471,7 @@ CountingLabel::CountingLabel() f.setPointSizeF(StyleHelper::sidebarFontSize()); setFont(f); setPalette(StyleHelper::sidebarFontPalette(palette())); + setProperty("_q_custom_style_disabled", QVariant(true)); updateCount(0); } |