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

Fix text color of progress/find status summary label

Browse Source 
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>
This commit is contained in:
Alessandro Portale
2016-07-21 17:14:52 +02:00
parent 4f13735e2b
commit 2a765db3a5
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/stylehelper.cpp
View File

@@ -93,10 +93,9 @@ QColor StyleHelper::notTooBrightHighlightColor()
QPalette StyleHelper::sidebarFontPalette(const QPalette &original) QPalette StyleHelper::sidebarFontPalette(const QPalette &original)
{ {
QPalette palette = original; QPalette palette = original;
palette.setColor(QPalette::Active, QPalette::Text, panelTextColor()); const QColor textColor = creatorTheme()->color(Theme::ProgressBarTitleColor);
palette.setColor(QPalette::Active, QPalette::WindowText, panelTextColor()); palette.setColor(QPalette::WindowText, textColor);
palette.setColor(QPalette::Inactive, QPalette::Text, panelTextColor().darker()); palette.setColor(QPalette::Text, textColor);
palette.setColor(QPalette::Inactive, QPalette::WindowText, panelTextColor().darker());
return palette; return palette;
} }

3
src/plugins/projectexplorer/buildprogress.cpp
View File

@@ -34,6 +34,7 @@
#include <QLabel> #include <QLabel>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QPixmap> #include <QPixmap>
#include <QVariant>
#include <QVBoxLayout> #include <QVBoxLayout>
using namespace ProjectExplorer; using namespace ProjectExplorer;
@@ -79,6 +80,8 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation
m_warningLabel->setFont(f); m_warningLabel->setFont(f);
m_errorLabel->setPalette(Utils::StyleHelper::sidebarFontPalette(m_errorLabel->palette())); m_errorLabel->setPalette(Utils::StyleHelper::sidebarFontPalette(m_errorLabel->palette()));
m_warningLabel->setPalette(Utils::StyleHelper::sidebarFontPalette(m_warningLabel->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_errorIcon->setAlignment(Qt::AlignRight);
m_warningIcon->setAlignment(Qt::AlignRight); m_warningIcon->setAlignment(Qt::AlignRight);

1
src/plugins/texteditor/basefilefind.cpp
View File

@@ -471,6 +471,7 @@ CountingLabel::CountingLabel()
f.setPointSizeF(StyleHelper::sidebarFontSize()); f.setPointSizeF(StyleHelper::sidebarFontSize());
setFont(f); setFont(f);
setPalette(StyleHelper::sidebarFontPalette(palette())); setPalette(StyleHelper::sidebarFontPalette(palette()));
setProperty("_q_custom_style_disabled", QVariant(true));
updateCount(0); updateCount(0);
} }