Feature/styleagent accent color

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "qmsetup"]
 	path = qmsetup
-	url = ../../stdware/qmsetup.git
-	branch = main
+	url = ../qmsetup.git
+	branch = main

examples/CMakeLists.txt

@@ -18,6 +18,8 @@ if(QWINDOWKIT_BUILD_WIDGETS)
     add_subdirectory(mainwindow)
 endif()
 
+add_subdirectory(accent_color)
+
 if(QWINDOWKIT_BUILD_QUICK)
     add_subdirectory(qml)
 endif()

examples/accent_color/CMakeLists.txt

@@ -0,0 +1,8 @@
+project(QWKExample_AccentColor)
+
+qwk_add_example(${PROJECT_NAME}
+    FEATURES cxx_std_17
+    SOURCES main.cpp
+    QT_LINKS Core Gui
+    LINKS QWKCore
+)

examples/accent_color/main.cpp

@@ -0,0 +1,18 @@
+#include <QGuiApplication>
+#include <QWKCore/styleagent.h>
+#include <QDebug>
+#include <QTimer>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+
+    QWK::StyleAgent agent;
+    QObject::connect(&agent, &QWK::StyleAgent::systemAccentColorChanged, [](){
+        qDebug() << "Accent color changed!" << QWK::StyleAgent().systemAccentColor();
+    });
+
+    qDebug() << "Initial Accent Color:" << agent.systemAccentColor();
+
+    return app.exec();
+}

src/core/style/styleagent.cpp

@@ -6,6 +6,9 @@
 #include "styleagent_p.h"
 
 #include <QtCore/QVariant>
+#include <QtGui/QColor>
+#include <QtGui/QPalette>
+#include <QtGui/QGuiApplication>
 
 namespace QWK {
 
@@ -38,6 +41,15 @@ namespace QWK {
         Q_EMIT q->systemThemeChanged();
     }
 
+    void StyleAgentPrivate::notifyAccentColorChanged(const QColor &color) {
+        if (color == systemAccentColor)
+            return;
+        systemAccentColor = color;
+
+        Q_Q(StyleAgent);
+        Q_EMIT q->systemAccentColorChanged();
+    }
+
     /*!
         Constructor. Since it is not related to a concrete window instance, it is better to be used
         as a singleton.
@@ -59,6 +71,21 @@ namespace QWK {
         return d->systemTheme;
     }
 
+    /*!
+        Returns the system accent color.
+    */
+    QColor StyleAgent::systemAccentColor() const {
+        Q_D(const StyleAgent);
+        if (d->systemAccentColor.isValid()) {
+            return d->systemAccentColor;
+        }
+#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+        return QGuiApplication::palette().color(QPalette::Accent);
+#else
+        return QGuiApplication::palette().color(QPalette::Highlight);
+#endif
+    }
+
     /*!
         \internal
     */
@@ -74,4 +101,10 @@ namespace QWK {
         This signal is emitted when the system theme changes.
     */
 
+    /*!
+        \fn void StyleAgent::systemAccentColorChanged()
+
+        This signal is emitted when the system accent color changes.
+    */
+
 }

src/core/style/styleagent.h

@@ -9,6 +9,7 @@
 
 #include <QtCore/QObject>
 #include <QtGui/QWindow>
+#include <QtGui/QColor>
 
 #include <QWKCore/qwkglobal.h>
 
@@ -33,9 +34,11 @@ namespace QWK {
 
     public:
         SystemTheme systemTheme() const;
+        QColor systemAccentColor() const;
 
     Q_SIGNALS:
         void systemThemeChanged();
+        void systemAccentColorChanged();
 
     protected:
         StyleAgent(StyleAgentPrivate &d, QObject *parent = nullptr);

src/core/style/styleagent_linux.cpp

@@ -5,10 +5,18 @@
 #include "styleagent_p.h"
 
 #include <QtCore/QVariant>
+#include <QtGui/QColor>
+#include <QtGui/QPalette>
+#include <QtGui/QGuiApplication>
 
 namespace QWK {
 
     void StyleAgentPrivate::setupSystemThemeHook() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+        systemAccentColor = QGuiApplication::palette().color(QPalette::Accent);
+#else
+        systemAccentColor = QGuiApplication::palette().color(QPalette::Highlight);
+#endif
     }
 
     void StyleAgentPrivate::removeSystemThemeHook() {

src/core/style/styleagent_mac.mm

@@ -7,6 +7,7 @@
 #include <Cocoa/Cocoa.h>
 
 #include <QtCore/QVariant>
+#include <QtGui/QColor>
 
 namespace QWK {
 
@@ -17,6 +18,17 @@
         return isDark ? StyleAgent::Dark : StyleAgent::Light;
     }
 
+    static QColor getAccentColor() {
+        if (@available(macOS 10.14, *)) {
+            NSColor *color = [NSColor controlAccentColor];
+            NSColor *rgbColor = [color colorUsingColorSpace:[NSColorSpace sRGBColorSpace]];
+            if (rgbColor) {
+                return QColor::fromRgbF(rgbColor.redComponent, rgbColor.greenComponent, rgbColor.blueComponent, rgbColor.alphaComponent);
+            }
+        }
+        return {};
+    }
+
     static void notifyAllStyleAgents();
 
 }
@@ -34,11 +46,15 @@ @implementation QWK_SystemThemeObserver
 - (id)init {
     self = [super init];
     if (self) {
-        [[NSDistributedNotificationCenter defaultCenter]
-            addObserver:self
+        NSDistributedNotificationCenter *center = [NSDistributedNotificationCenter defaultCenter];
+        [center addObserver:self
                selector:@selector(interfaceModeChanged:)
                    name:@"AppleInterfaceThemeChangedNotification"
                  object:nil];
+        [center addObserver:self
+               selector:@selector(interfaceModeChanged:)
+                   name:@"AppleColorPreferencesChangedNotification"
+                 object:nil];
     }
     return self;
 }
@@ -68,13 +84,16 @@ - (void)interfaceModeChanged:(NSNotification *)notification {
 
     void notifyAllStyleAgents() {
         auto theme = getSystemTheme();
+        auto color = getAccentColor();
         for (auto &&ap : std::as_const(*g_styleAgentSet())) {
             ap->notifyThemeChanged(theme);
+            ap->notifyAccentColorChanged(color);
         }
     }
 
     void StyleAgentPrivate::setupSystemThemeHook() {
         systemTheme = getSystemTheme();
+        systemAccentColor = getAccentColor();
 
         // Alloc
         if (g_styleAgentSet->isEmpty()) {

src/core/style/styleagent_p.h

@@ -31,11 +31,13 @@ namespace QWK {
         StyleAgent *q_ptr;
 
         StyleAgent::SystemTheme systemTheme = StyleAgent::Unknown;
+        QColor systemAccentColor;
 
         void setupSystemThemeHook();
         void removeSystemThemeHook();
 
         void notifyThemeChanged(StyleAgent::SystemTheme theme);
+        void notifyAccentColorChanged(const QColor &color);
     };
 
 }

src/core/style/styleagent_win.cpp

@@ -28,8 +28,10 @@ namespace QWK {
 
     static void notifyAllStyleAgents() {
         auto theme = getSystemTheme();
+        auto color = getAccentColor();
         for (auto &&ap : std::as_const(*g_styleAgentSet())) {
             ap->notifyThemeChanged(theme);
+            ap->notifyAccentColorChanged(color);
         }
     }
 
@@ -84,6 +86,7 @@ namespace QWK {
 
     void StyleAgentPrivate::setupSystemThemeHook() {
         systemTheme = getSystemTheme();
+        systemAccentColor = getAccentColor();
 
         g_styleAgentSet->insert(this);
         SystemSettingEventFilter::install();