From 6c0043c1e3d97398828fbd56448f1cd8ee201e66 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周五, 23 2月 2024 01:01:10 +0800
Subject: [PATCH] Fix bug of window closing and reshowing
---
examples/mainwindow/mainwindow.cpp | 115 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 87 insertions(+), 28 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index 86420ac..4021ec3 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -1,3 +1,7 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#include "mainwindow.h"
#include <QtCore/QDebug>
@@ -5,6 +9,7 @@
#include <QtCore/QTime>
#include <QtCore/QTimer>
#include <QtGui/QPainter>
+#include <QtGui/QWindow>
#include <QtWidgets/QApplication>
#include <QtWidgets/QStyle>
#include <QtWidgets/QPushButton>
@@ -14,7 +19,8 @@
# include <QtWidgets/QActionGroup>
#endif
-#include <QWKCore/styleagent.h>
+// #include <QtWebEngineWidgets/QWebEngineView>
+
#include <QWKWidgets/widgetwindowagent.h>
#include <widgetframe/windowbar.h>
@@ -36,18 +42,25 @@
};
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
- installWindowAgent();
- installStyleAgent();
+ installWindowAgent();
+#if 1
auto clockWidget = new ClockWidget();
clockWidget->setObjectName(QStringLiteral("clock-widget"));
clockWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
setCentralWidget(clockWidget);
+#else
+ auto webView = new QWebEngineView();
+ webView->load(QUrl("https://www.baidu.com"));
+ setCentralWidget(webView);
+#endif
loadStyleSheet(Dark);
setWindowTitle(tr("Example MainWindow"));
resize(800, 600);
+
+ // windowAgent->centralize();
}
static inline void emulateLeaveEvent(QWidget *widget) {
@@ -110,6 +123,14 @@
return QMainWindow::event(event);
}
+
+void MainWindow::closeEvent(QCloseEvent *event) {
+ // if (!(qApp->keyboardModifiers() & Qt::ControlModifier)) {
+ // QTimer::singleShot(1000, this, &QWidget::show);
+ // }
+ event->accept();
+}
+
void MainWindow::installWindowAgent() {
// 1. Setup window agent
windowAgent = new QWK::WidgetWindowAgent(this);
@@ -142,7 +163,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 +173,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 +183,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 +193,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);
@@ -243,14 +303,21 @@
windowBar->setTitleLabel(titleLabel);
windowBar->setHostWidget(this);
- windowAgent->setTitleBar(windowBar);
+ windowAgent->setTitleBar(windowBar);
#ifndef Q_OS_MAC
- windowAgent->setSystemButton(QWK::WindowAgentBase::WindowIcon, iconButton);
- windowAgent->setSystemButton(QWK::WindowAgentBase::Minimize, minButton);
- windowAgent->setSystemButton(QWK::WindowAgentBase::Maximize, maxButton);
- windowAgent->setSystemButton(QWK::WindowAgentBase::Close, closeButton);
+ windowAgent->setSystemButton(QWK::WindowAgentBase::WindowIcon, iconButton);
+ windowAgent->setSystemButton(QWK::WindowAgentBase::Minimize, minButton);
+ windowAgent->setSystemButton(QWK::WindowAgentBase::Maximize, maxButton);
+ windowAgent->setSystemButton(QWK::WindowAgentBase::Close, closeButton);
#endif
- windowAgent->setHitTestVisible(menuBar, true);
+ 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);
@@ -291,18 +358,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