feat: add system theme on Qt 6.5

Chatterino · Jan 21, 2024 · e314a26 · e314a26
1 parent 65d3e73
commit e314a26
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/src/singletons/Theme.cpp b/src/singletons/Theme.cpp
@@ -6,13 +6,17 @@
 #include "common/QLogging.hpp"
 #include "singletons/Paths.hpp"
 #include "singletons/Resources.hpp"
+#include "singletons/WindowManager.hpp"
 
 #include <QColor>
 #include <QDir>
 #include <QElapsedTimer>
 #include <QFile>
 #include <QJsonDocument>
 #include <QSet>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#    include <QStyleHints>
+#endif
 
 #include <cmath>
 
@@ -208,7 +212,15 @@ const std::vector<ThemeDescriptor> Theme::builtInThemes{
         .key = "Black",
         .path = ":/themes/Black.json",
         .name = "Black",
+    }
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+    ,
+    {
+        .key = "System",
+        .path = ":/themes/Dark.json",
+        .name = "System",
     },
+#endif
 };
 
 // Dark is our default & fallback theme
@@ -219,6 +231,11 @@ bool Theme::isLightTheme() const
     return this->isLight_;
 }
 
+bool Theme::isSystemTheme() const
+{
+    return this->themeName == u"System";
+}
+
 void Theme::initialize(Settings &settings, const Paths &paths)
 {
     this->themeName.connect(
@@ -230,12 +247,40 @@ void Theme::initialize(Settings &settings, const Paths &paths)
 
     this->loadAvailableThemes(paths);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+    QObject::connect(qApp->styleHints(), &QStyleHints::colorSchemeChanged,
+                     &this->lifetime_, [this] {
+                         if (this->isSystemTheme())
+                         {
+                             this->update();
+                             getIApp()->getWindows()->forceLayoutChannelViews();
+                         }
+                     });
+#endif
+
     this->update();
 }
 
 void Theme::update()
 {
-    auto oTheme = this->findThemeByKey(this->themeName);
+    auto currentTheme = [&]() -> QString {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+        if (this->isSystemTheme())
+        {
+            switch (qApp->styleHints()->colorScheme())
+            {
+                case Qt::ColorScheme::Light:
+                    return u"Light"_s;
+                case Qt::ColorScheme::Unknown:
+                case Qt::ColorScheme::Dark:
+                    return u"Dark"_s;
+            }
+        }
+#endif
+        return this->themeName;
+    };
+
+    auto oTheme = this->findThemeByKey(currentTheme());
 
     constexpr const double nsToMs = 1.0 / 1000000.0;
     QElapsedTimer timer;

diff --git a/src/singletons/Theme.hpp b/src/singletons/Theme.hpp
@@ -46,6 +46,7 @@ class Theme final : public Singleton
     void initialize(Settings &settings, const Paths &paths) final;
 
     bool isLightTheme() const;
+    bool isSystemTheme() const;
 
     struct TabColors {
         QColor text;
@@ -164,6 +165,8 @@ class Theme final : public Singleton
     // This will only be populated when auto-reloading themes
     QJsonObject currentThemeJson_;
 
+    QObject lifetime_;
+
     /**
      * Figure out which themes are available in the Themes directory
      *