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 | 215 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 176 insertions(+), 39 deletions(-) diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp index c3c133b..14227ea 100644 --- a/examples/mainwindow/mainwindow.cpp +++ b/examples/mainwindow/mainwindow.cpp @@ -1,12 +1,25 @@ +// 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> #include <QtCore/QFile> #include <QtCore/QTime> #include <QtCore/QTimer> +#include <QtGui/QPainter> +#include <QtGui/QWindow> #include <QtWidgets/QApplication> #include <QtWidgets/QStyle> #include <QtWidgets/QPushButton> +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +# include <QtGui/QActionGroup> +#else +# include <QtWidgets/QActionGroup> +#endif + +// #include <QtWebEngineWidgets/QWebEngineView> #include <QWKWidgets/widgetwindowagent.h> @@ -31,18 +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 - if (QFile qss(QStringLiteral(":/dark-style.qss")); - qss.open(QIODevice::ReadOnly | QIODevice::Text)) { - setStyleSheet(QString::fromUtf8(qss.readAll())); - } + loadStyleSheet(Dark); setWindowTitle(tr("Example MainWindow")); resize(800, 600); + + // setFixedHeight(600); + // windowAgent->centralize(); } static inline void emulateLeaveEvent(QWidget *widget) { @@ -87,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; } @@ -105,27 +128,139 @@ 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 - - // Equivalent to: - // auto agent = new QWK::WidgetWindowAgent(w); - // agent->setup(w); - QWK::WidgetWindowAgent *agent = QWK::setupWidgetWindow(this); + windowAgent = new QWK::WidgetWindowAgent(this); + windowAgent->setup(this); // 2. Construct your title bar - auto menuBar = []() { - auto menuBar = new QMenuBar(); + auto menuBar = [this]() { + auto menuBar = new QMenuBar(this); + + // Virtual menu auto file = new QMenu(tr("File(&F)"), menuBar); file->addAction(new QAction(tr("New(&N)"), menuBar)); file->addAction(new QAction(tr("Open(&O)"), menuBar)); + file->addSeparator(); auto edit = new QMenu(tr("Edit(&E)"), menuBar); edit->addAction(new QAction(tr("Undo(&U)"), menuBar)); edit->addAction(new QAction(tr("Redo(&R)"), menuBar)); + // Theme action + auto darkAction = new QAction(tr("Enable dark theme"), menuBar); + darkAction->setCheckable(true); + connect(darkAction, &QAction::triggered, this, [this](bool checked) { + loadStyleSheet(checked ? Dark : Light); // + }); + connect(this, &MainWindow::themeChanged, darkAction, [this, darkAction]() { + darkAction->setChecked(currentTheme == Dark); // + }); + +#ifdef Q_OS_WIN + auto dwmBlurAction = new QAction(tr("Enable DWM blur"), menuBar); + dwmBlurAction->setData(QStringLiteral("dwm-blur")); + dwmBlurAction->setCheckable(true); + + auto acrylicAction = new QAction(tr("Enable acrylic material"), menuBar); + acrylicAction->setData(QStringLiteral("acrylic-material")); + acrylicAction->setCheckable(true); + + auto micaAction = new QAction(tr("Enable mica"), menuBar); + micaAction->setData(QStringLiteral("mica")); + micaAction->setCheckable(true); + + 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); + } + windowAgent->setWindowAttribute(action->data().toString(), action->isChecked()); + setProperty("custom-style", action->isChecked()); + 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 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); menuBar->addMenu(edit); + menuBar->addMenu(settings); return menuBar; }(); menuBar->setObjectName(QStringLiteral("win-menu-bar")); @@ -167,35 +302,24 @@ windowBar->setTitleLabel(titleLabel); windowBar->setHostWidget(this); - agent->setTitleBar(windowBar); + windowAgent->setTitleBar(windowBar); #ifndef Q_OS_MAC - agent->setSystemButton(QWK::WindowAgentBase::WindowIcon, iconButton); - agent->setSystemButton(QWK::WindowAgentBase::Minimize, minButton); - agent->setSystemButton(QWK::WindowAgentBase::Maximize, maxButton); - agent->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 - agent->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); - // 3. Adds simulated mouse events to the title bar buttons -#ifdef Q_OS_WINDOWS - // Emulate Window system menu button behaviors - connect(iconButton, &QAbstractButton::clicked, agent, [iconButton, agent] { - iconButton->setProperty("double-click-close", false); - - // Pick a suitable time threshold - QTimer::singleShot(75, agent, [iconButton, agent]() { - if (iconButton->property("double-click-close").toBool()) - return; - agent->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); @@ -214,3 +338,16 @@ connect(windowBar, &QWK::WindowBar::closeRequested, this, &QWidget::close); #endif } + +void MainWindow::loadStyleSheet(Theme theme) { + if (!styleSheet().isEmpty() && theme == currentTheme) + return; + currentTheme = theme; + + if (QFile qss(theme == Dark ? QStringLiteral(":/dark-style.qss") + : QStringLiteral(":/light-style.qss")); + qss.open(QIODevice::ReadOnly | QIODevice::Text)) { + setStyleSheet(QString::fromUtf8(qss.readAll())); + Q_EMIT themeChanged(); + } +} -- Gitblit v1.9.1