From 46285db399f75154ad6c451e12f2cae2e59ace25 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 24 12月 2023 23:52:03 +0800
Subject: [PATCH] Use brilliant workaround to show Windows 10 top border
---
examples/mainwindow/mainwindow.cpp | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index a394a19..a1a39dd 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>
@@ -111,6 +115,10 @@
windowAgent = new QWK::WidgetWindowAgent(this);
windowAgent->setup(this);
+#ifdef Q_OS_WIN
+ windowAgent->setWindowAttribute(QStringLiteral("dark-mode"), true);
+#endif
+
// 2. Construct your title bar
auto menuBar = [this]() {
auto menuBar = new QMenuBar();
@@ -139,8 +147,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 +157,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 +167,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 +177,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