From 0cedc474f38dca024f77ebf1d7ac5bf22c19744a Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周五, 22 12月 2023 20:51:50 +0800
Subject: [PATCH] fix compile error on win
---
examples/mainwindow/mainwindow.cpp | 94 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 22 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index e289c3e..7faf057 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -4,10 +4,17 @@
#include <QtCore/QFile>
#include <QtCore/QTime>
#include <QtCore/QTimer>
+#include <QtGui/QPainter>
#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 <QWKCore/styleagent.h>
#include <QWKWidgets/widgetwindowagent.h>
#include <widgetframe/windowbar.h>
@@ -30,6 +37,7 @@
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
installWindowAgent();
+ installStyleAgent();
auto clockWidget = new ClockWidget();
clockWidget->setObjectName(QStringLiteral("clock-widget"));
@@ -104,11 +112,11 @@
void MainWindow::installWindowAgent() {
// 1. Setup window agent
- auto agent = new QWK::WidgetWindowAgent(this);
- agent->setup(this);
+ windowAgent = new QWK::WidgetWindowAgent(this);
+ windowAgent->setup(this);
// 2. Construct your title bar
- auto menuBar = [this, agent]() {
+ auto menuBar = [this]() {
auto menuBar = new QMenuBar();
// Virtual menu
@@ -122,7 +130,7 @@
edit->addAction(new QAction(tr("Redo(&R)"), menuBar));
// Theme action
- auto darkAction = new QAction(tr("Dark Theme"), menuBar);
+ auto darkAction = new QAction(tr("Enable dark theme"), menuBar);
darkAction->setCheckable(true);
connect(darkAction, &QAction::triggered, this, [this](bool checked) {
loadStyleSheet(checked ? Dark : Light); //
@@ -131,19 +139,56 @@
darkAction->setChecked(currentTheme == Dark); //
});
- // Agent action
- auto framelessOnAction = new QAction(tr("Enable Frameless"), menuBar);
- framelessOnAction->setCheckable(true);
- framelessOnAction->setChecked(true);
- connect(framelessOnAction, &QAction::triggered, agent, &QWK::WindowAgentBase::setEnabled);
- connect(agent, &QWK::WindowAgentBase::enabledChanged, framelessOnAction,
- &QAction::setChecked);
+#ifdef Q_OS_WIN
+ auto dwmBlurAction = new QAction(tr("Enable DWM blur"), menuBar);
+ dwmBlurAction->setCheckable(true);
+ connect(dwmBlurAction, &QAction::triggered, this, [this](bool checked) {
+ windowAgent->setWindowAttribute(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) {
+ windowAgent->setWindowAttribute(QStringLiteral("acrylic-material"), QColor::fromRgbF(1.f, 1.f, 1.f, 0.6f));
+ 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) {
+ windowAgent->setWindowAttribute(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) {
+ windowAgent->setWindowAttribute(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(framelessOnAction);
+ settings->addAction(dwmBlurAction);
+ settings->addAction(acrylicAction);
+ settings->addAction(micaAction);
+ settings->addAction(micaAltAction);
+#endif
menuBar->addMenu(file);
menuBar->addMenu(edit);
@@ -189,28 +234,28 @@
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);
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] {
+ connect(iconButton, &QAbstractButton::clicked, windowAgent, [this, iconButton] {
iconButton->setProperty("double-click-close", false);
// Pick a suitable time threshold
- QTimer::singleShot(75, agent, [iconButton, agent]() {
+ QTimer::singleShot(75, windowAgent, [this, iconButton]() {
if (iconButton->property("double-click-close").toBool())
return;
- agent->showSystemMenu(iconButton->mapToGlobal(QPoint{0, iconButton->height()}));
+ windowAgent->showSystemMenu(iconButton->mapToGlobal(QPoint{0, iconButton->height()}));
});
});
connect(iconButton, &QWK::WindowButton::doubleClicked, this, [iconButton, this]() {
@@ -237,14 +282,19 @@
#endif
}
+void MainWindow::installStyleAgent() {
+ styleAgent = new QWK::StyleAgent(this);
+}
+
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();
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1