From 5bfd136473edc506b860177bf88626e35a5a1ba4 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: ćšć, 28 12æ 2023 12:06:54 +0800
Subject: [PATCH] Add mac blur view
---
examples/mainwindow/mainwindow.cpp | 71 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index 86420ac..154aa62 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -14,7 +14,6 @@
# include <QtWidgets/QActionGroup>
#endif
-#include <QWKCore/styleagent.h>
#include <QWKWidgets/widgetwindowagent.h>
#include <widgetframe/windowbar.h>
@@ -37,7 +36,6 @@
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
installWindowAgent();
- installStyleAgent();
auto clockWidget = new ClockWidget();
clockWidget->setObjectName(QStringLiteral("clock-widget"));
@@ -142,7 +140,7 @@
#ifdef Q_OS_WIN
auto dwmBlurAction = new QAction(tr("Enable DWM blur"), menuBar);
dwmBlurAction->setCheckable(true);
- connect(dwmBlurAction, &QAction::triggered, this, [this](bool checked) {
+ connect(dwmBlurAction, &QAction::toggled, this, [this](bool checked) {
if (!windowAgent->setWindowAttribute(QStringLiteral("dwm-blur"), checked)) {
return;
}
@@ -152,9 +150,8 @@
auto acrylicAction = new QAction(tr("Enable acrylic material"), menuBar);
acrylicAction->setCheckable(true);
- connect(acrylicAction, &QAction::triggered, this, [this](bool checked) {
- if (!windowAgent->setWindowAttribute(QStringLiteral("acrylic-material"),
- QColor::fromRgbF(1.f, 1.f, 1.f, 0.6f))) {
+ connect(acrylicAction, &QAction::toggled, this, [this](bool checked) {
+ if (!windowAgent->setWindowAttribute(QStringLiteral("acrylic-material"), true)) {
return;
}
setProperty("custom-style", checked);
@@ -163,7 +160,7 @@
auto micaAction = new QAction(tr("Enable mica"), menuBar);
micaAction->setCheckable(true);
- connect(micaAction, &QAction::triggered, this, [this](bool checked) {
+ connect(micaAction, &QAction::toggled, this, [this](bool checked) {
if (!windowAgent->setWindowAttribute(QStringLiteral("mica"), checked)) {
return;
}
@@ -173,30 +170,70 @@
auto micaAltAction = new QAction(tr("Enable mica alt"), menuBar);
micaAltAction->setCheckable(true);
- connect(micaAltAction, &QAction::triggered, this, [this](bool checked) {
+ connect(micaAltAction, &QAction::toggled, this, [this](bool checked) {
if (!windowAgent->setWindowAttribute(QStringLiteral("mica-alt"), checked)) {
return;
}
setProperty("custom-style", checked);
style()->polish(this);
});
+#elif defined(Q_OS_MAC)
+ auto darkBlurAction = new QAction(tr("Dark blur"), menuBar);
+ darkBlurAction->setCheckable(true);
+ connect(darkBlurAction, &QAction::toggled, this, [this](bool checked) {
+ if (!windowAgent->setWindowAttribute(QStringLiteral("blur-effect"), "dark")) {
+ return;
+ }
+ if (checked) {
+ setProperty("custom-style", true);
+ style()->polish(this);
+ }
+ });
- auto winStyleGroup = new QActionGroup(menuBar);
- winStyleGroup->addAction(dwmBlurAction);
- winStyleGroup->addAction(acrylicAction);
- winStyleGroup->addAction(micaAction);
- winStyleGroup->addAction(micaAltAction);
+ auto lightBlurAction = new QAction(tr("Light blur"), menuBar);
+ lightBlurAction->setCheckable(true);
+ connect(lightBlurAction, &QAction::toggled, this, [this](bool checked) {
+ if (!windowAgent->setWindowAttribute(QStringLiteral("blur-effect"), "light")) {
+ return;
+ }
+ if (checked) {
+ setProperty("custom-style", true);
+ style()->polish(this);
+ }
+ });
+
+ auto noBlurAction = new QAction(tr("No blur"), menuBar);
+ noBlurAction->setCheckable(true);
+ connect(noBlurAction, &QAction::toggled, this, [this](bool checked) {
+ if (!windowAgent->setWindowAttribute(QStringLiteral("blur-effect"), "none")) {
+ return;
+ }
+ if (checked) {
+ setProperty("custom-style", false);
+ style()->polish(this);
+ }
+ });
+
+ auto macStyleGroup = new QActionGroup(menuBar);
+ macStyleGroup->addAction(darkBlurAction);
+ macStyleGroup->addAction(lightBlurAction);
+ macStyleGroup->addAction(noBlurAction);
#endif
// Real menu
auto settings = new QMenu(tr("Settings(&S)"), menuBar);
settings->addAction(darkAction);
+
#ifdef Q_OS_WIN
settings->addSeparator();
settings->addAction(dwmBlurAction);
settings->addAction(acrylicAction);
settings->addAction(micaAction);
settings->addAction(micaAltAction);
+#elif defined(Q_OS_MAC)
+ settings->addAction(darkBlurAction);
+ settings->addAction(lightBlurAction);
+ settings->addAction(noBlurAction);
#endif
menuBar->addMenu(file);
@@ -291,18 +328,10 @@
#endif
}
-void MainWindow::installStyleAgent() {
- styleAgent = new QWK::StyleAgent(this);
-}
-
void MainWindow::loadStyleSheet(Theme theme) {
if (!styleSheet().isEmpty() && theme == currentTheme)
return;
currentTheme = theme;
-
-#ifdef Q_OS_WIN
- windowAgent->setWindowAttribute(QStringLiteral("dark-mode"), currentTheme == Dark);
-#endif
if (QFile qss(theme == Dark ? QStringLiteral(":/dark-style.qss")
: QStringLiteral(":/light-style.qss"));
--
Gitblit v1.9.1