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
---
examples/mainwindow/mainwindow.cpp | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index a394a19..206b7f2 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -8,9 +8,12 @@
#include <QtWidgets/QApplication>
#include <QtWidgets/QStyle>
#include <QtWidgets/QPushButton>
-#include <QtWidgets/QActionGroup>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+# include <QtGui/QActionGroup>
+#else
+# include <QtWidgets/QActionGroup>
+#endif
-#include <QWKCore/styleagent.h>
#include <QWKWidgets/widgetwindowagent.h>
#include <widgetframe/windowbar.h>
@@ -33,7 +36,6 @@
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
installWindowAgent();
- installStyleAgent();
auto clockWidget = new ClockWidget();
clockWidget->setObjectName(QStringLiteral("clock-widget"));
@@ -139,8 +141,9 @@
auto dwmBlurAction = new QAction(tr("Enable DWM blur"), menuBar);
dwmBlurAction->setCheckable(true);
connect(dwmBlurAction, &QAction::triggered, this, [this](bool checked) {
- QWindow *w = windowHandle();
- styleAgent->setWindowAttribute(w, QStringLiteral("dwm-blur"), checked);
+ if (!windowAgent->setWindowAttribute(QStringLiteral("dwm-blur"), checked)) {
+ return;
+ }
setProperty("custom-style", checked);
style()->polish(this);
});
@@ -148,8 +151,9 @@
auto acrylicAction = new QAction(tr("Enable acrylic material"), menuBar);
acrylicAction->setCheckable(true);
connect(acrylicAction, &QAction::triggered, this, [this](bool checked) {
- QWindow *w = windowHandle();
- styleAgent->setWindowAttribute(w, QStringLiteral("acrylic-material"), QColor());
+ if (!windowAgent->setWindowAttribute(QStringLiteral("acrylic-material"), true)) {
+ return;
+ }
setProperty("custom-style", checked);
style()->polish(this);
});
@@ -157,8 +161,9 @@
auto micaAction = new QAction(tr("Enable mica"), menuBar);
micaAction->setCheckable(true);
connect(micaAction, &QAction::triggered, this, [this](bool checked) {
- QWindow *w = windowHandle();
- styleAgent->setWindowAttribute(w, QStringLiteral("mica"), checked);
+ if (!windowAgent->setWindowAttribute(QStringLiteral("mica"), checked)) {
+ return;
+ }
setProperty("custom-style", checked);
style()->polish(this);
});
@@ -166,8 +171,9 @@
auto micaAltAction = new QAction(tr("Enable mica alt"), menuBar);
micaAltAction->setCheckable(true);
connect(micaAltAction, &QAction::triggered, this, [this](bool checked) {
- QWindow *w = windowHandle();
- styleAgent->setWindowAttribute(w, QStringLiteral("mica-alt"), checked);
+ if (!windowAgent->setWindowAttribute(QStringLiteral("mica-alt"), checked)) {
+ return;
+ }
setProperty("custom-style", checked);
style()->polish(this);
});
@@ -280,10 +286,6 @@
});
connect(windowBar, &QWK::WindowBar::closeRequested, this, &QWidget::close);
#endif
-}
-
-void MainWindow::installStyleAgent() {
- styleAgent = new QWK::StyleAgent(this);
}
void MainWindow::loadStyleSheet(Theme theme) {
--
Gitblit v1.9.1