From bdc57c6ec9b08f74ca65a06b8496fbaa3268c5fd Mon Sep 17 00:00:00 2001
From: Dylan Liu <mentalflow@ourdocs.cn>
Date: 周六, 04 5月 2024 20:51:20 +0800
Subject: [PATCH] Fix macOS title bar buttons not displaying properly.
---
examples/mainwindow/mainwindow.cpp | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index c27bddd..4021ec3 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -19,6 +19,8 @@
# include <QtWidgets/QActionGroup>
#endif
+// #include <QtWebEngineWidgets/QWebEngineView>
+
#include <QWKWidgets/widgetwindowagent.h>
#include <widgetframe/windowbar.h>
@@ -40,17 +42,25 @@
};
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
- installWindowAgent();
+ 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);
+
+ // windowAgent->centralize();
}
static inline void emulateLeaveEvent(QWidget *widget) {
@@ -111,6 +121,14 @@
break;
}
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() {
@@ -285,14 +303,14 @@
windowBar->setTitleLabel(titleLabel);
windowBar->setHostWidget(this);
- windowAgent->setTitleBar(windowBar);
+ 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);
+ 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);
+ windowAgent->setHitTestVisible(menuBar, true);
#ifdef Q_OS_MAC
windowAgent->setSystemButtonAreaCallback([](const QSize &size) {
--
Gitblit v1.9.1