From cd352b186c2881af9342cf76693500ce3a48be8a Mon Sep 17 00:00:00 2001
From: XieLong <xielongmaster@gmail.com>
Date: 周日, 15 9月 2024 12:32:05 +0800
Subject: [PATCH] Optimize mainwindow Example code, ensure that only one style is selected at a time. (#137)
---
examples/mainwindow/mainwindow.cpp | 102 +++++++++++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index 574fc06..14227ea 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -1,4 +1,5 @@
-// Copyright (C) 2023-2024 Stdware Collections
+// 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"
@@ -17,6 +18,8 @@
#else
# include <QtWidgets/QActionGroup>
#endif
+
+// #include <QtWebEngineWidgets/QWebEngineView>
#include <QWKWidgets/widgetwindowagent.h>
@@ -41,15 +44,24 @@
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
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);
+
+ // setFixedHeight(600);
+ // windowAgent->centralize();
}
static inline void emulateLeaveEvent(QWidget *widget) {
@@ -94,15 +106,19 @@
switch (event->type()) {
case QEvent::WindowActivate: {
auto menu = menuWidget();
- menu->setProperty("bar-active", true);
- style()->polish(menu);
+ if (menu) {
+ menu->setProperty("bar-active", true);
+ style()->polish(menu);
+ }
break;
}
case QEvent::WindowDeactivate: {
auto menu = menuWidget();
- menu->setProperty("bar-active", false);
- style()->polish(menu);
+ if (menu) {
+ menu->setProperty("bar-active", false);
+ style()->polish(menu);
+ }
break;
}
@@ -112,6 +128,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);
@@ -119,7 +143,7 @@
// 2. Construct your title bar
auto menuBar = [this]() {
- auto menuBar = new QMenuBar();
+ auto menuBar = new QMenuBar(this);
// Virtual menu
auto file = new QMenu(tr("File(&F)"), menuBar);
@@ -143,44 +167,38 @@
#ifdef Q_OS_WIN
auto dwmBlurAction = new QAction(tr("Enable DWM blur"), menuBar);
+ dwmBlurAction->setData(QStringLiteral("dwm-blur"));
dwmBlurAction->setCheckable(true);
- connect(dwmBlurAction, &QAction::toggled, this, [this](bool checked) {
- if (!windowAgent->setWindowAttribute(QStringLiteral("dwm-blur"), checked)) {
- return;
- }
- setProperty("custom-style", checked);
- style()->polish(this);
- });
auto acrylicAction = new QAction(tr("Enable acrylic material"), menuBar);
+ acrylicAction->setData(QStringLiteral("acrylic-material"));
acrylicAction->setCheckable(true);
- connect(acrylicAction, &QAction::toggled, this, [this](bool checked) {
- if (!windowAgent->setWindowAttribute(QStringLiteral("acrylic-material"), true)) {
- return;
- }
- setProperty("custom-style", checked);
- style()->polish(this);
- });
auto micaAction = new QAction(tr("Enable mica"), menuBar);
+ micaAction->setData(QStringLiteral("mica"));
micaAction->setCheckable(true);
- connect(micaAction, &QAction::toggled, this, [this](bool checked) {
- if (!windowAgent->setWindowAttribute(QStringLiteral("mica"), checked)) {
- return;
+
+ auto micaAltAction = new QAction(tr("Enable mica alt"), menuBar);
+ micaAltAction->setData(QStringLiteral("mica-alt"));
+ micaAltAction->setCheckable(true);
+
+ auto winStyleGroup = new QActionGroup(menuBar);
+ // At most one action can be checked at any one time. The actions can also be all unchecked.
+ winStyleGroup->setExclusionPolicy(QActionGroup::ExclusionPolicy::ExclusiveOptional);
+ winStyleGroup->addAction(dwmBlurAction);
+ winStyleGroup->addAction(acrylicAction);
+ winStyleGroup->addAction(micaAction);
+ winStyleGroup->addAction(micaAltAction);
+ connect(winStyleGroup, &QActionGroup::triggered, this, [this, winStyleGroup](QAction *action) {
+ // Unset all custom style attributes first, otherwise the style will not display correctly
+ for (auto _act : winStyleGroup->actions()) {
+ windowAgent->setWindowAttribute(_act->data().toString(), false);
}
- setProperty("custom-style", checked);
+ windowAgent->setWindowAttribute(action->data().toString(), action->isChecked());
+ setProperty("custom-style", action->isChecked());
style()->polish(this);
});
- auto micaAltAction = new QAction(tr("Enable mica alt"), menuBar);
- micaAltAction->setCheckable(true);
- 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);
@@ -302,24 +320,6 @@
setMenuWidget(windowBar);
- // 3. Adds simulated mouse events to the title bar buttons
-#ifdef Q_OS_WINDOWS
- // Emulate Window system menu button behaviors
- connect(iconButton, &QAbstractButton::clicked, windowAgent, [this, iconButton] {
- iconButton->setProperty("double-click-close", false);
-
- // Pick a suitable time threshold
- QTimer::singleShot(75, windowAgent, [this, iconButton]() {
- if (iconButton->property("double-click-close").toBool())
- return;
- windowAgent->showSystemMenu(iconButton->mapToGlobal(QPoint{0, iconButton->height()}));
- });
- });
- connect(iconButton, &QWK::WindowButton::doubleClicked, this, [iconButton, this]() {
- iconButton->setProperty("double-click-close", true);
- close();
- });
-#endif
#ifndef Q_OS_MAC
connect(windowBar, &QWK::WindowBar::minimizeRequested, this, &QWidget::showMinimized);
--
Gitblit v1.9.1