summaryrefslogtreecommitdiff
path: root/src/libs/utils/theme/theme.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/utils/theme/theme.cpp')
-rw-r--r--src/libs/utils/theme/theme.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/libs/utils/theme/theme.cpp b/src/libs/utils/theme/theme.cpp
index 95b03c9c86..ccfba5f6fc 100644
--- a/src/libs/utils/theme/theme.cpp
+++ b/src/libs/utils/theme/theme.cpp
@@ -324,14 +324,20 @@ void Theme::readSettings(QSettings &settings)
}
}
-QPalette Theme::palette(const QPalette &base) const
+QPalette Theme::initialPalette()
{
+ static QPalette palette = QApplication::palette();
+ return palette;
+}
+
+QPalette Theme::palette() const
+{
+ QPalette pal = initialPalette();
if (!flag(DerivePaletteFromTheme))
- return base;
+ return pal;
// FIXME: introduce some more color roles for this
- QPalette pal = base;
pal.setColor(QPalette::All, QPalette::Window, color(Theme::BackgroundColorNormal));
pal.setBrush(QPalette::All, QPalette::WindowText, color(Theme::TextColorNormal));
pal.setColor(QPalette::All, QPalette::Base, color(Theme::BackgroundColorNormal));