From 1900ef3c9805d7fe15e0634cef9b5ff2a5dc7838 Mon Sep 17 00:00:00 2001 From: SineStriker <trueful@163.com> Date: 周三, 20 12月 2023 20:02:05 +0800 Subject: [PATCH] minor tweaks --- examples/mainwindow/mainwindow.cpp | 70 +++++++++++++++++++++++++++++----- 1 files changed, 59 insertions(+), 11 deletions(-) diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp index 80a4c3a..e289c3e 100644 --- a/examples/mainwindow/mainwindow.cpp +++ b/examples/mainwindow/mainwindow.cpp @@ -36,12 +36,10 @@ clockWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setCentralWidget(clockWidget); - 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(640, 480); + resize(800, 600); } static inline void emulateLeaveEvent(QWidget *widget) { @@ -105,23 +103,51 @@ } void MainWindow::installWindowAgent() { + // 1. Setup window agent auto agent = new QWK::WidgetWindowAgent(this); - if (!agent->setup(this)) { - qFatal("QWK failed to initialize."); - } + agent->setup(this); - auto menuBar = []() { + // 2. Construct your title bar + auto menuBar = [this, agent]() { auto menuBar = new QMenuBar(); + + // 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("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); // + }); + + // 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); + + // Real menu + auto settings = new QMenu(tr("Settings(&S)"), menuBar); + settings->addAction(darkAction); + settings->addSeparator(); + settings->addAction(framelessOnAction); + menuBar->addMenu(file); menuBar->addMenu(edit); + menuBar->addMenu(settings); return menuBar; }(); menuBar->setObjectName(QStringLiteral("win-menu-bar")); @@ -130,6 +156,7 @@ titleLabel->setAlignment(Qt::AlignCenter); titleLabel->setObjectName(QStringLiteral("win-title-label")); +#ifndef Q_OS_MAC auto iconButton = new QWK::WindowButton(); iconButton->setObjectName(QStringLiteral("icon-button")); iconButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); @@ -149,30 +176,38 @@ 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); +#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); +#endif agent->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, agent, [iconButton, agent] { iconButton->setProperty("double-click-close", false); // Pick a suitable time threshold - QTimer::singleShot(75, [iconButton, agent]() { + QTimer::singleShot(75, agent, [iconButton, agent]() { if (iconButton->property("double-click-close").toBool()) return; agent->showSystemMenu(iconButton->mapToGlobal(QPoint{0, iconButton->height()})); @@ -184,6 +219,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) { @@ -198,5 +234,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(); + } +} \ No newline at end of file -- Gitblit v1.9.1