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

utils: Fix StyleHelper::baseColor with lightColored

Browse Source 
Change-Id: I3b06664585c0a608962f2d627859fd388bcb0372
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2018-01-07 21:38:17 +01:00
parent 4ab5dbeb3a
commit 4c0e86ecc1
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,16 +114,10 @@ QColor StyleHelper::m_requestedBaseColor;
QColor StyleHelper::baseColor(bool lightColored) QColor StyleHelper::baseColor(bool lightColored)
{ {
static const QColor windowColor = QApplication::palette().color(QPalette::Window);
static const bool windowColorAsBase = creatorTheme()->flag(Theme::WindowColorAsBase); static const bool windowColorAsBase = creatorTheme()->flag(Theme::WindowColorAsBase);
if (windowColorAsBase) {
static const QColor windowColor = QApplication::palette().color(QPalette::Window);
return windowColor;
}
if (!lightColored) return (lightColored || windowColorAsBase) ? windowColor : m_baseColor;
return m_baseColor;
else
return m_baseColor.lighter(230);
} }
QColor StyleHelper::highlightColor(bool lightColored) QColor StyleHelper::highlightColor(bool lightColored)