From 4273df8b2505a3e7d201113ac63dd29335eccfe1 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 21 5月 2024 18:00:24 +0800
Subject: [PATCH] minor tweaks
---
examples/mainwindow/mainwindow.cpp | 259 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 208 insertions(+), 51 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index 47c7791..696b907 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,17 +44,25 @@
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
installWindowAgent();
+#if 1
auto clockWidget = new ClockWidget();
- clockWidget->setObjectName("clock-widget");
+ 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(":/dark-style.qss"); qss.open(QIODevice::ReadOnly | QIODevice::Text)) {
- setStyleSheet(QString::fromUtf8(qss.readAll()));
- }
+ loadStyleSheet(Dark);
- setWindowTitle("Example MainWindow");
- resize(640, 480);
+ setWindowTitle(tr("Example MainWindow"));
+ resize(800, 600);
+
+ setFixedHeight(600);
+
+ // windowAgent->centralize();
}
static inline void emulateLeaveEvent(QWidget *widget) {
@@ -80,22 +101,25 @@
});
}
-MainWindow::~MainWindow() {
-}
+MainWindow::~MainWindow() = default;
bool MainWindow::event(QEvent *event) {
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,86 +129,206 @@
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() {
- auto agent = new QWK::WidgetWindowAgent(this);
- if (!agent->setup(this)) {
- qFatal("Frameless handle failed to initialize.");
- }
+ // 1. Setup window agent
+ windowAgent = new QWK::WidgetWindowAgent(this);
+ windowAgent->setup(this);
- auto menuBar = []() {
+ // 2. Construct your title bar
+ auto menuBar = [this]() {
auto menuBar = new QMenuBar();
- auto file = new QMenu("File(&F)", menuBar);
- file->addAction(new QAction("New(&N)", menuBar));
- file->addAction(new QAction("Open(&O)", menuBar));
- auto edit = new QMenu("Edit(&E)", menuBar);
- edit->addAction(new QAction("Undo(&U)", menuBar));
- edit->addAction(new QAction("Redo(&R)", menuBar));
+ // 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->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->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->setCheckable(true);
+ connect(micaAction, &QAction::toggled, this, [this](bool checked) {
+ if (!windowAgent->setWindowAttribute(QStringLiteral("mica"), checked)) {
+ return;
+ }
+ setProperty("custom-style", checked);
+ 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);
+ 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("win-menu-bar");
+ menuBar->setObjectName(QStringLiteral("win-menu-bar"));
auto titleLabel = new QLabel();
titleLabel->setAlignment(Qt::AlignCenter);
- titleLabel->setObjectName("win-title-label");
+ titleLabel->setObjectName(QStringLiteral("win-title-label"));
+#ifndef Q_OS_MAC
auto iconButton = new QWK::WindowButton();
- iconButton->setObjectName("icon-button");
+ iconButton->setObjectName(QStringLiteral("icon-button"));
iconButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
auto minButton = new QWK::WindowButton();
- minButton->setObjectName("min-button");
+ minButton->setObjectName(QStringLiteral("min-button"));
minButton->setProperty("system-button", true);
minButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
auto maxButton = new QWK::WindowButton();
maxButton->setCheckable(true);
- maxButton->setObjectName("max-button");
+ maxButton->setObjectName(QStringLiteral("max-button"));
maxButton->setProperty("system-button", true);
maxButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
auto closeButton = new QWK::WindowButton();
- closeButton->setObjectName("close-button");
+ closeButton->setObjectName(QStringLiteral("close-button"));
closeButton->setProperty("system-button", true);
closeButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+#endif
auto windowBar = new QWK::WindowBar();
+#ifndef Q_OS_MAC
windowBar->setIconButton(iconButton);
windowBar->setMinButton(minButton);
windowBar->setMaxButton(maxButton);
windowBar->setCloseButton(closeButton);
+#endif
windowBar->setMenuBar(menuBar);
windowBar->setTitleLabel(titleLabel);
windowBar->setHostWidget(this);
- agent->setTitleBar(windowBar);
- agent->setSystemButton(QWK::WindowAgentBase::WindowIcon, iconButton);
- agent->setSystemButton(QWK::WindowAgentBase::Minimize, minButton);
- agent->setSystemButton(QWK::WindowAgentBase::Maximize, maxButton);
- agent->setSystemButton(QWK::WindowAgentBase::Close, closeButton);
- agent->setHitTestVisible(menuBar, true);
+ 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);
+#endif
+ windowAgent->setHitTestVisible(menuBar, true);
-#ifdef Q_OS_WINDOWS
- // Emulate Window system menu button behaviors
- connect(iconButton, &QAbstractButton::clicked, this, [iconButton, agent] {
- iconButton->setProperty("double-click-close", false);
-
- // Pick a suitable time threshold
- QTimer::singleShot(75, [iconButton, agent]() {
- if (iconButton->property("double-click-close").toBool())
- return;
- agent->showSystemMenu(iconButton->mapToGlobal({0, iconButton->height()}));
- });
- });
- connect(iconButton, &QWK::WindowButton::doubleClicked, this, [iconButton, this]() {
- iconButton->setProperty("double-click-close", true);
- close();
+#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);
+
+
+#ifndef Q_OS_MAC
connect(windowBar, &QWK::WindowBar::minimizeRequested, this, &QWidget::showMinimized);
connect(windowBar, &QWK::WindowBar::maximizeRequested, this, [this, maxButton](bool max) {
if (max) {
@@ -199,5 +343,18 @@
emulateLeaveEvent(maxButton);
});
connect(windowBar, &QWK::WindowBar::closeRequested, this, &QWidget::close);
- setMenuWidget(windowBar);
+#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