From 4f9f75cb4b70f3b76cee57d0f98b59f8475bba3b Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周三, 27 12月 2023 05:56:28 +0800
Subject: [PATCH] Add mac theme notifications
---
src/core/style/styleagent_win.cpp | 79 ++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 46 deletions(-)
diff --git a/src/core/style/styleagent_win.cpp b/src/core/style/styleagent_win.cpp
index 663b632..e118713 100644
--- a/src/core/style/styleagent_win.cpp
+++ b/src/core/style/styleagent_win.cpp
@@ -12,6 +12,23 @@
using StyleAgentSet = QSet<StyleAgentPrivate *>;
Q_GLOBAL_STATIC(StyleAgentSet, g_styleAgentSet)
+ static StyleAgent::SystemTheme getSystemTheme() {
+ if (isHighContrastModeEnabled()) {
+ return StyleAgent::HighContrast;
+ } else if (isDarkThemeActive()) {
+ return StyleAgent::Dark;
+ } else {
+ return StyleAgent::Light;
+ }
+ }
+
+ static void notifyAllStyleAgents() {
+ auto theme = getSystemTheme();
+ for (auto &&ap : std::as_const(*g_styleAgentSet())) {
+ ap->notifyThemeChanged(theme);
+ }
+ }
+
class SystemSettingEventFilter : public AppNativeEventFilter {
public:
bool nativeEventFilter(const QByteArray &eventType, void *message,
@@ -21,47 +38,25 @@
return false;
}
- auto themeChanged = [message]() -> bool {
- const auto msg = static_cast<const MSG *>(message);
- switch (msg->message) {
- case WM_THEMECHANGED:
- case WM_SYSCOLORCHANGE:
- case WM_DWMCOLORIZATIONCOLORCHANGED:
- return true;
-
- case WM_SETTINGCHANGE: {
- if (!msg->wParam && msg->lParam &&
- std::wcscmp(reinterpret_cast<LPCWSTR>(msg->lParam), L"ImmersiveColorSet") ==
- 0) {
- return true;
- }
- break;
- }
-
- default:
- break;
+ const auto msg = static_cast<const MSG *>(message);
+ switch (msg->message) {
+ case WM_THEMECHANGED:
+ case WM_SYSCOLORCHANGE:
+ case WM_DWMCOLORIZATIONCOLORCHANGED: {
+ notifyAllStyleAgents();
+ break;
}
- return false;
- }();
- if (themeChanged) {
- auto theme = []() -> StyleAgent::SystemTheme {
- if (isHighContrastModeEnabled()) {
- return StyleAgent::HighContrast;
- } else if (isDarkThemeActive()) {
- return StyleAgent::Dark;
- } else {
- return StyleAgent::Light;
+ case WM_SETTINGCHANGE: {
+ if (isImmersiveColorSetChange(msg->wParam, msg->lParam)) {
+ notifyAllStyleAgents();
}
- }();
- for (auto &&ap : std::as_const(*g_styleAgentSet())) {
- if (ap->systemTheme != theme) {
- ap->systemTheme = theme;
- ap->notifyThemeChanged(theme);
- }
+ break;
}
+
+ default:
+ break;
}
-
return false;
}
@@ -85,17 +80,9 @@
SystemSettingEventFilter *SystemSettingEventFilter::instance = nullptr;
- void StyleAgentPrivate::init() {
- if (isHighContrastModeEnabled()) {
- systemTheme = StyleAgent::HighContrast;
- } else if (isDarkThemeActive()) {
- systemTheme = StyleAgent::Dark;
- } else {
- systemTheme = StyleAgent::Light;
- }
- }
-
void StyleAgentPrivate::setupSystemThemeHook() {
+ systemTheme = getSystemTheme();
+
g_styleAgentSet->insert(this);
SystemSettingEventFilter::install();
}
--
Gitblit v1.9.1