Use registry-based dark mode detection on <= Windows 10

Signed-off-by: Claudio Cambra <[email protected]> f dete Signed-off-by: Claudio Cambra <[email protected]>
nextcloud · Nov 5, 2024 · 06d2cca · 06d2cca
1 parent c314538
commit 06d2cca
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
@@ -1022,17 +1022,28 @@ QVariantMap Theme::systemPalette()
 bool Theme::darkMode()
 {
     connectToPaletteSignal();
-    switch (qGuiApp->styleHints()->colorScheme())
-    {
-    case Qt::ColorScheme::Dark:
-        return true;
-    case Qt::ColorScheme::Light:
+    const auto isDarkFromStyle = [] {
+        switch (qGuiApp->styleHints()->colorScheme())
+        {
+        case Qt::ColorScheme::Dark:
+            return true;
+        case Qt::ColorScheme::Light:
+            return false;
+        case Qt::ColorScheme::Unknown:
+            return Theme::isDarkColor(QGuiApplication::palette().window().color());
+        }
+
         return false;
-    case Qt::ColorScheme::Unknown:
-        return Theme::isDarkColor(QGuiApplication::palette().window().color());
-    }
+    };
 
-    return false;
+#ifdef Q_OS_WIN
+    if (!IsWindows11OrGreater() && 
+        Utility::registryKeyExists(HKEY_CURRENT_USER, darkModeSubkey) &&
+        !Utility::registryGetKeyValue(HKEY_CURRENT_USER, darkModeSubkey, QStringLiteral("AppsUseLightTheme")).toBool()) {
+        return true;
+    }
+#endif
+    return isDarkFromStyle();
 }
 
 void Theme::setOverrideServerUrl(const QString &overrideServerUrl)