From bd5a102d23a3da3192b9cc02ccaf0de77b45c72e Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周六, 23 12月 2023 13:54:34 +0800
Subject: [PATCH] update qmsetup
---
examples/mainwindow/mainwindow.cpp | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index a394a19..e693228 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -8,7 +8,11 @@
#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>
@@ -139,8 +143,7 @@
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);
+ windowAgent->setWindowAttribute(QStringLiteral("dwm-blur"), checked);
setProperty("custom-style", checked);
style()->polish(this);
});
@@ -148,8 +151,7 @@
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());
+ windowAgent->setWindowAttribute(QStringLiteral("acrylic-material"), QColor::fromRgbF(1.f, 1.f, 1.f, 0.6f));
setProperty("custom-style", checked);
style()->polish(this);
});
@@ -157,8 +159,7 @@
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);
+ windowAgent->setWindowAttribute(QStringLiteral("mica"), checked);
setProperty("custom-style", checked);
style()->polish(this);
});
@@ -166,8 +167,7 @@
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);
+ windowAgent->setWindowAttribute(QStringLiteral("mica-alt"), checked);
setProperty("custom-style", checked);
style()->polish(this);
});
@@ -291,6 +291,10 @@
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"));
qss.open(QIODevice::ReadOnly | QIODevice::Text)) {
--
Gitblit v1.9.1