From 862cbfe3032b1f71977fb66af7bd87645ec3eeac Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: ćšć, 21 12æ 2023 23:27:04 +0800
Subject: [PATCH] minor tweaks
---
examples/mainwindow/mainwindow.cpp | 163 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 128 insertions(+), 35 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index 47c7791..508df7b 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -4,11 +4,14 @@
#include <QtCore/QFile>
#include <QtCore/QTime>
#include <QtCore/QTimer>
+#include <QtGui/QPainter>
#include <QtWidgets/QApplication>
#include <QtWidgets/QStyle>
#include <QtWidgets/QPushButton>
+#include <QtWidgets/QActionGroup>
#include <QWKWidgets/widgetwindowagent.h>
+#include <QWKStyleSupport/styleagent.h>
#include <widgetframe/windowbar.h>
#include <widgetframe/windowbutton.h>
@@ -31,17 +34,17 @@
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
installWindowAgent();
+ styleAgent = new QWK::StyleAgent(this);
+
auto clockWidget = new ClockWidget();
- clockWidget->setObjectName("clock-widget");
+ clockWidget->setObjectName(QStringLiteral("clock-widget"));
clockWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
setCentralWidget(clockWidget);
- 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);
}
static inline void emulateLeaveEvent(QWidget *widget) {
@@ -80,8 +83,7 @@
});
}
-MainWindow::~MainWindow() {
-}
+MainWindow::~MainWindow() = default;
bool MainWindow::event(QEvent *event) {
switch (event->type()) {
@@ -106,77 +108,155 @@
}
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::triggered, this, [this](bool checked){
+ QWindow *w = windowHandle();
+ styleAgent->setWindowAttribute(w, QStringLiteral("dwm-blur"), checked);
+ setProperty("custom-style", checked);
+ style()->polish(this);
+ });
+
+ auto acrylicAction = new QAction(tr("Enable acrylic material"), menuBar);
+ acrylicAction->setCheckable(true);
+ connect(acrylicAction, &QAction::triggered, this, [this](bool checked){
+ QWindow *w = windowHandle();
+ styleAgent->setWindowAttribute(w, QStringLiteral("acrylic-material"), QColor());
+ setProperty("custom-style", checked);
+ style()->polish(this);
+ });
+
+ auto micaAction = new QAction(tr("Enable mica"), menuBar);
+ micaAction->setCheckable(true);
+ connect(micaAction, &QAction::triggered, this, [this](bool checked){
+ QWindow *w = windowHandle();
+ styleAgent->setWindowAttribute(w, QStringLiteral("mica"), checked);
+ setProperty("custom-style", checked);
+ style()->polish(this);
+ });
+
+ auto micaAltAction = new QAction(tr("Enable mica alt"), menuBar);
+ micaAltAction->setCheckable(true);
+ connect(micaAltAction, &QAction::triggered, this, [this](bool checked){
+ QWindow *w = windowHandle();
+ styleAgent->setWindowAttribute(w, QStringLiteral("mica-alt"), checked);
+ setProperty("custom-style", checked);
+ style()->polish(this);
+ });
+
+ auto winStyleGroup = new QActionGroup(menuBar);
+ winStyleGroup->addAction(dwmBlurAction);
+ winStyleGroup->addAction(acrylicAction);
+ winStyleGroup->addAction(micaAction);
+ winStyleGroup->addAction(micaAltAction);
+#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);
+#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);
+ 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, this, [iconButton, agent] {
+ connect(iconButton, &QAbstractButton::clicked, windowAgent, [this, iconButton] {
iconButton->setProperty("double-click-close", false);
// Pick a suitable time threshold
- QTimer::singleShot(75, [iconButton, agent]() {
+ QTimer::singleShot(75, windowAgent, [this, iconButton]() {
if (iconButton->property("double-click-close").toBool())
return;
- agent->showSystemMenu(iconButton->mapToGlobal({0, iconButton->height()}));
+ windowAgent->showSystemMenu(iconButton->mapToGlobal(QPoint{0, iconButton->height()}));
});
});
connect(iconButton, &QWK::WindowButton::doubleClicked, this, [iconButton, this]() {
@@ -185,6 +265,7 @@
});
#endif
+#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 +280,17 @@
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