From c2e349f1c38b55fd12f8ae537e754fa6658ab631 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 01 1月 2024 20:21:34 +0800
Subject: [PATCH] Tested 5.12.8
---
examples/mainwindow/mainwindow.cpp | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 19 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index a1a39dd..574fc06 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -1,3 +1,6 @@
+// Copyright (C) 2023-2024 Stdware Collections
+// SPDX-License-Identifier: Apache-2.0
+
#include "mainwindow.h"
#include <QtCore/QDebug>
@@ -5,6 +8,7 @@
#include <QtCore/QTime>
#include <QtCore/QTimer>
#include <QtGui/QPainter>
+#include <QtGui/QWindow>
#include <QtWidgets/QApplication>
#include <QtWidgets/QStyle>
#include <QtWidgets/QPushButton>
@@ -14,7 +18,6 @@
# include <QtWidgets/QActionGroup>
#endif
-#include <QWKCore/styleagent.h>
#include <QWKWidgets/widgetwindowagent.h>
#include <widgetframe/windowbar.h>
@@ -37,7 +40,6 @@
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
installWindowAgent();
- installStyleAgent();
auto clockWidget = new ClockWidget();
clockWidget->setObjectName(QStringLiteral("clock-widget"));
@@ -115,10 +117,6 @@
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();
@@ -146,7 +144,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;
}
@@ -156,7 +154,7 @@
auto acrylicAction = new QAction(tr("Enable acrylic material"), menuBar);
acrylicAction->setCheckable(true);
- connect(acrylicAction, &QAction::triggered, this, [this](bool checked) {
+ connect(acrylicAction, &QAction::toggled, this, [this](bool checked) {
if (!windowAgent->setWindowAttribute(QStringLiteral("acrylic-material"), true)) {
return;
}
@@ -166,7 +164,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;
}
@@ -176,30 +174,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);
@@ -255,6 +293,13 @@
#endif
windowAgent->setHitTestVisible(menuBar, true);
+#ifdef Q_OS_MAC
+ windowAgent->setSystemButtonAreaCallback([](const QSize &size) {
+ static constexpr const int width = 75;
+ return QRect(QPoint(size.width() - width, 0), QSize(width, size.height())); //
+ });
+#endif
+
setMenuWidget(windowBar);
// 3. Adds simulated mouse events to the title bar buttons
@@ -292,10 +337,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