From 3e942c3dc8955be577079fbc028ce216e1c594b2 Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周二, 11 2月 2025 19:07:53 +0800
Subject: [PATCH] Fix numerous bugs (#162)
---
examples/mainwindow/mainwindow.cpp | 193 ++++++++++++++++++++++++++++++++---------------
1 files changed, 130 insertions(+), 63 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index 86420ac..a8d2c61 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -1,3 +1,7 @@
+// 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>
@@ -5,6 +9,7 @@
#include <QtCore/QTime>
#include <QtCore/QTimer>
#include <QtGui/QPainter>
+#include <QtGui/QWindow>
#include <QtWidgets/QApplication>
#include <QtWidgets/QStyle>
#include <QtWidgets/QPushButton>
@@ -14,7 +19,8 @@
# include <QtWidgets/QActionGroup>
#endif
-#include <QWKCore/styleagent.h>
+// #include <QtWebEngineWidgets/QWebEngineView>
+
#include <QWKWidgets/widgetwindowagent.h>
#include <widgetframe/windowbar.h>
@@ -31,23 +37,34 @@
protected:
void timerEvent(QTimerEvent *event) override {
+ QLabel::timerEvent(event);
setText(QTime::currentTime().toString(QStringLiteral("hh:mm:ss")));
}
};
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
- installWindowAgent();
- installStyleAgent();
+ setAttribute(Qt::WA_DontCreateNativeAncestors);
+ 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) {
@@ -92,15 +109,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;
}
@@ -117,7 +138,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);
@@ -140,63 +161,112 @@
});
#ifdef Q_OS_WIN
+ auto noneAction = new QAction(tr("None"), menuBar);
+ noneAction->setData(QStringLiteral("none"));
+ noneAction->setCheckable(true);
+ noneAction->setChecked(true);
+
auto dwmBlurAction = new QAction(tr("Enable DWM blur"), menuBar);
+ dwmBlurAction->setData(QStringLiteral("dwm-blur"));
dwmBlurAction->setCheckable(true);
- connect(dwmBlurAction, &QAction::triggered, 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::triggered, this, [this](bool checked) {
- if (!windowAgent->setWindowAttribute(QStringLiteral("acrylic-material"),
- QColor::fromRgbF(1.f, 1.f, 1.f, 0.6f))) {
- 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::triggered, 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->setData(QStringLiteral("mica-alt"));
micaAltAction->setCheckable(true);
- connect(micaAltAction, &QAction::triggered, this, [this](bool checked) {
- if (!windowAgent->setWindowAttribute(QStringLiteral("mica-alt"), checked)) {
- return;
- }
- setProperty("custom-style", checked);
- style()->polish(this);
- });
auto winStyleGroup = new QActionGroup(menuBar);
+ winStyleGroup->addAction(noneAction);
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 (const QAction *_act : winStyleGroup->actions()) {
+ const QString data = _act->data().toString();
+ if (data.isEmpty() || data == QStringLiteral("none")) {
+ continue;
+ }
+ windowAgent->setWindowAttribute(data, false);
+ }
+ const QString data = action->data().toString();
+ if (data == QStringLiteral("none")) {
+ setProperty("custom-style", false);
+ } else if (!data.isEmpty()) {
+ windowAgent->setWindowAttribute(data, true);
+ setProperty("custom-style", true);
+ }
+ 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(noneAction);
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);
@@ -214,6 +284,12 @@
auto iconButton = new QWK::WindowButton();
iconButton->setObjectName(QStringLiteral("icon-button"));
iconButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+
+ auto pinButton = new QWK::WindowButton();
+ pinButton->setCheckable(true);
+ pinButton->setObjectName(QStringLiteral("pin-button"));
+ pinButton->setProperty("system-button", true);
+ pinButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
auto minButton = new QWK::WindowButton();
minButton->setObjectName(QStringLiteral("min-button"));
@@ -235,6 +311,7 @@
auto windowBar = new QWK::WindowBar();
#ifndef Q_OS_MAC
windowBar->setIconButton(iconButton);
+ windowBar->setPinButton(pinButton);
windowBar->setMinButton(minButton);
windowBar->setMaxButton(maxButton);
windowBar->setCloseButton(closeButton);
@@ -245,6 +322,7 @@
windowAgent->setTitleBar(windowBar);
#ifndef Q_OS_MAC
+ windowAgent->setHitTestVisible(pinButton, true);
windowAgent->setSystemButton(QWK::WindowAgentBase::WindowIcon, iconButton);
windowAgent->setSystemButton(QWK::WindowAgentBase::Minimize, minButton);
windowAgent->setSystemButton(QWK::WindowAgentBase::Maximize, maxButton);
@@ -252,28 +330,25 @@
#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, 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();
+#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::pinRequested, this, [this, pinButton](bool pin){
+ if (isHidden() || isMinimized() || isMaximized() || isFullScreen()) {
+ return;
+ }
+ setWindowFlag(Qt::WindowStaysOnTopHint, pin);
+ show();
+ pinButton->setChecked(pin);
+ });
connect(windowBar, &QWK::WindowBar::minimizeRequested, this, &QWidget::showMinimized);
connect(windowBar, &QWK::WindowBar::maximizeRequested, this, [this, maxButton](bool max) {
if (max) {
@@ -291,18 +366,10 @@
#endif
}
-void MainWindow::installStyleAgent() {
- styleAgent = new QWK::StyleAgent(this);
-}
-
void MainWindow::loadStyleSheet(Theme theme) {
if (!styleSheet().isEmpty() && theme == currentTheme)
return;
currentTheme = theme;
-
-#ifdef Q_OS_WIN
- windowAgent->setWindowAttribute(QStringLiteral("dark-mode"), currentTheme == Dark);
-#endif
if (QFile qss(theme == Dark ? QStringLiteral(":/dark-style.qss")
: QStringLiteral(":/light-style.qss"));
--
Gitblit v1.9.1