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

2 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index a9953bad69..12a719a1e8 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -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()
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 201105098f..ed1d48afb8 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -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));