Commit de7af4f2 authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Fixed the default UI color

When there was no existing configuration, it would get set to pure black
on startup, resulting in a very dark gray Qt Creator. Now it is back to
its old friendly gray as default color.

Also made sure that the default on startup and the color used for
resetting the UI color in the settings are always in sync.

Reviewed-by: Jens Bache-Wiig
parent 5afeaa72
......@@ -94,8 +94,9 @@ QColor StyleHelper::panelTextColor(bool lightColored)
return Qt::black;
}
QColor StyleHelper::m_baseColor(0x666666);
QColor StyleHelper::m_requestedBaseColor(0x666666);
// Invalid by default, setBaseColor needs to be called at least once
QColor StyleHelper::m_baseColor;
QColor StyleHelper::m_requestedBaseColor;
QColor StyleHelper::baseColor(bool lightColored)
{
......
......@@ -50,6 +50,8 @@ namespace Utils {
class QTCREATOR_UTILS_EXPORT StyleHelper
{
public:
static const unsigned int DEFAULT_BASE_COLOR = 0x666666;
// Height of the project explorer navigation bar
static int navigationWidgetHeight() { return 24; }
static qreal sidebarFontSize();
......
......@@ -237,7 +237,7 @@ void GeneralSettings::finish()
void GeneralSettings::resetInterfaceColor()
{
m_page->colorButton->setColor(0x666666);
m_page->colorButton->setColor(StyleHelper::DEFAULT_BASE_COLOR);
}
void GeneralSettings::resetExternalEditor()
......
......@@ -1130,7 +1130,9 @@ void MainWindow::readSettings()
// Get adapted base color.
m_overrideColor = Utils::StyleHelper::baseColor();
} else {
Utils::StyleHelper::setBaseColor(m_settings->value(QLatin1String(colorKey)).value<QColor>());
Utils::StyleHelper::setBaseColor(
m_settings->value(QLatin1String(colorKey),
QColor(Utils::StyleHelper::DEFAULT_BASE_COLOR)).value<QColor>());
}
const QVariant geom = m_settings->value(QLatin1String(geometryKey));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment