From 2f2ee6571e9ce784db0488ade60816f09bd7448c Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周三, 27 12月 2023 01:56:47 +0800
Subject: [PATCH] Finish customize system button pos for QtWidgets
---
examples/mainwindow/mainwindow.cpp | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index a394a19..983a7a3 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,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 +153,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 +163,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 +173,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);
});
--
Gitblit v1.9.1