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

Utils: Improved handling of StyleHelper::baseColor

Browse Source 
This change makes sure that the "UI coloring" feature respects the
original brightness of the current theme. It prevents dark themes from
getting a too light recoloring and vice versa.

Extra benefit: this allows to remove much recently introduced code.

Change-Id: Ib2c96e7ed172a4cc97520aa4b5d180cc6353c661
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-03-21 12:48:06 +01:00
parent 2baa1f8b77
commit ddde4bdd27
7 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@
#include "stylehelper.h"
#include "theme/theme.h"
#include "hostosinfo.h"
#include <QPixmapCache>
@@ -108,11 +109,6 @@ QColor StyleHelper::baseColor(bool lightColored)
return m_baseColor.lighter(230);
}
bool StyleHelper::isBaseColorDefault()
{
return m_requestedBaseColor == DEFAULT_BASE_COLOR;
}
QColor StyleHelper::highlightColor(bool lightColored)
{
QColor result = baseColor(lightColored);
@@ -152,10 +148,20 @@ void StyleHelper::setBaseColor(const QColor &newcolor)
{
m_requestedBaseColor = newcolor;
const QColor themeBaseColor = creatorTheme()->color(Theme::PanelStatusBarBackgroundColor);
const QColor defaultBaseColor = QColor(DEFAULT_BASE_COLOR);
QColor color;
color.setHsv(newcolor.hue(),
newcolor.saturation() * 0.7,
64 + newcolor.value() / 3);
if (defaultBaseColor == newcolor) {
color = themeBaseColor;
} else {
const int valueDelta = (newcolor.value() - defaultBaseColor.value()) / 3;
const int value = qBound(0, themeBaseColor.value() + valueDelta, 255);
color.setHsv(newcolor.hue(),
newcolor.saturation() * 0.7,
value);
}
if (color.isValid() && color != m_baseColor) {
m_baseColor = color;