From f00226f79780b4138e0138654ffb2d7279f4ee28 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Sun, 6 Apr 2025 06:40:43 -0400
Subject: [PATCH] fix(SystemTheme): use default palette on all system themes

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit e5861129ad58a8b5cdf55ed69bb9a7ce92811b87)
---
 launcher/ui/themes/SystemTheme.cpp  | 23 ++++++++++++++++-------
 launcher/ui/themes/SystemTheme.h    |  2 +-
 launcher/ui/themes/ThemeManager.cpp |  6 ++++--
 launcher/ui/themes/ThemeManager.h   |  1 +
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/launcher/ui/themes/SystemTheme.cpp b/launcher/ui/themes/SystemTheme.cpp
index c755b379b..7fba08026 100644
--- a/launcher/ui/themes/SystemTheme.cpp
+++ b/launcher/ui/themes/SystemTheme.cpp
@@ -40,20 +40,29 @@
 #include "HintOverrideProxyStyle.h"
 #include "ThemeManager.h"
 
-SystemTheme::SystemTheme(const QString& styleName, bool isDefaultTheme)
+// See https://github.com/MultiMC/Launcher/issues/1790
+// or https://github.com/PrismLauncher/PrismLauncher/issues/490
+static const QStringList S_NATIVE_STYLES{ "windows11", "windowsvista", "macos", "system", "windows" };
+
+SystemTheme::SystemTheme(const QString& styleName, const QPalette& defaultPalette, bool isDefaultTheme)
 {
     m_themeName = isDefaultTheme ? "system" : styleName;
     m_widgetTheme = styleName;
-    auto style = QStyleFactory::create(styleName);
-    m_colorPalette = style->standardPalette();
-    delete style;
+    // NOTE: SystemTheme is reconstructed on page refresh. We can't accurately determine the system palette here
+    // See also S_NATIVE_STYLES comment
+    if (S_NATIVE_STYLES.contains(m_themeName)) {
+        m_colorPalette = defaultPalette;
+    } else {
+        auto style = QStyleFactory::create(styleName);
+        m_colorPalette = style->standardPalette();
+        delete style;
+    }
 }
 
 void SystemTheme::apply(bool initial)
 {
-    // See https://github.com/MultiMC/Launcher/issues/1790
-    // or https://github.com/PrismLauncher/PrismLauncher/issues/490
-    if (initial && m_themeName == "system") {
+    // See S_NATIVE_STYLES comment
+    if (initial && S_NATIVE_STYLES.contains(m_themeName)) {
         QApplication::setStyle(new HintOverrideProxyStyle(QStyleFactory::create(qtTheme())));
         return;
     }
diff --git a/launcher/ui/themes/SystemTheme.h b/launcher/ui/themes/SystemTheme.h
index 54404d052..7ae24c3db 100644
--- a/launcher/ui/themes/SystemTheme.h
+++ b/launcher/ui/themes/SystemTheme.h
@@ -38,7 +38,7 @@
 
 class SystemTheme : public ITheme {
    public:
-    SystemTheme(const QString& styleName, bool isDefaultTheme);
+    SystemTheme(const QString& styleName, const QPalette& defaultPalette, bool isDefaultTheme);
     virtual ~SystemTheme() {}
     void apply(bool initial) override;
 
diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp
index 6c50d7409..30a1fe7be 100644
--- a/launcher/ui/themes/ThemeManager.cpp
+++ b/launcher/ui/themes/ThemeManager.cpp
@@ -44,6 +44,8 @@ ThemeManager::ThemeManager()
     m_defaultStyle = style->objectName();
     themeDebugLog() << "System theme seems to be:" << m_defaultStyle;
 
+    m_defaultPalette = QApplication::palette();
+
     initializeThemes();
     initializeCatPacks();
 }
@@ -126,7 +128,7 @@ void ThemeManager::initializeIcons()
 void ThemeManager::initializeWidgets()
 {
     themeDebugLog() << "<> Initializing Widget Themes";
-    themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<SystemTheme>(m_defaultStyle, true));
+    themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<SystemTheme>(m_defaultStyle, m_defaultPalette, true));
     auto darkThemeId = addTheme(std::make_unique<DarkTheme>());
     themeDebugLog() << "Loading Built-in Theme:" << darkThemeId;
     themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<BrightTheme>());
@@ -139,7 +141,7 @@ void ThemeManager::initializeWidgets()
             continue;
         }
 #endif
-        themeDebugLog() << "Loading System Theme:" << addTheme(std::make_unique<SystemTheme>(st, false));
+        themeDebugLog() << "Loading System Theme:" << addTheme(std::make_unique<SystemTheme>(st, m_defaultPalette, false));
     }
 
     // TODO: need some way to differentiate same name themes in different subdirectories
diff --git a/launcher/ui/themes/ThemeManager.h b/launcher/ui/themes/ThemeManager.h
index 9c9e818e5..8de7562d1 100644
--- a/launcher/ui/themes/ThemeManager.h
+++ b/launcher/ui/themes/ThemeManager.h
@@ -68,6 +68,7 @@ class ThemeManager {
     QDir m_applicationThemeFolder{ "themes" };
     QDir m_catPacksFolder{ "catpacks" };
     std::map<QString, std::unique_ptr<CatPack>> m_catPacks;
+    QPalette m_defaultPalette;
     QString m_defaultStyle;
     LogColors m_logColors;