Fix theming with Qt 5.15

* Fixes #4765
* Fixes #4766

1 files changed, 26 insertions, 20 deletions

diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp
index 4a382567e..273ab8763 100644
--- a/src/gui/Application.cpp
+++ b/src/gui/Application.cpp
@@ -68,26 +68,6 @@ Application::Application(int& argc, char** argv)
     registerUnixSignals();
 #endif
 
-    QString appTheme = config()->get(Config::GUI_ApplicationTheme).toString();
-    if (appTheme == "auto") {
-        if (osUtils->isDarkMode()) {
-            setStyle(new DarkStyle);
-            m_darkTheme = true;
-        } else {
-            setStyle(new LightStyle);
-        }
-    } else if (appTheme == "light") {
-        setStyle(new LightStyle);
-    } else if (appTheme == "dark") {
-        setStyle(new DarkStyle);
-        m_darkTheme = true;
-    } else {
-        // Classic mode, only check for dark theme when not on Windows
-#ifndef Q_OS_WIN
-        m_darkTheme = osUtils->isDarkMode();
-#endif
-    }
-
     QString userName = qgetenv("USER");
     if (userName.isEmpty()) {
         userName = qgetenv("USERNAME");
@@ -162,6 +142,32 @@ Application::~Application()
     }
 }
 
+void Application::applyTheme()
+{
+    QString appTheme = config()->get(Config::GUI_ApplicationTheme).toString();
+    if (appTheme == "auto") {
+        if (osUtils->isDarkMode()) {
+            setStyle(new DarkStyle);
+            m_darkTheme = true;
+        } else {
+            setStyle(new LightStyle);
+        }
+    } else if (appTheme == "light") {
+        setStyle(new LightStyle);
+    } else if (appTheme == "dark") {
+        setStyle(new DarkStyle);
+        m_darkTheme = true;
+    } else {
+        // Classic mode, don't check for dark theme on Windows
+        // because Qt 5.x does not support it
+#ifndef Q_OS_WIN
+        m_darkTheme = osUtils->isDarkMode();
+#endif
+    }
+
+    setPalette(style()->standardPalette());
+}
+
 bool Application::event(QEvent* event)
 {
     // Handle Apple QFileOpenEvent from finder (double click on .kdbx file)