From 49b27d64a9778d53a3accd9bfbfbc3ee1a1a7178 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 08 5月 2024 20:44:05 +0800
Subject: [PATCH] minor tweaks
---
examples/mainwindow/mainwindow.cpp | 48 +++++++++++++++++++-----------------------------
1 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index 8d6372a..c704812 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,19 +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();
+ // windowAgent->centralize();
}
static inline void emulateLeaveEvent(QWidget *widget) {
@@ -117,9 +125,9 @@
void MainWindow::closeEvent(QCloseEvent *event) {
- if (!(qApp->keyboardModifiers() & Qt::ControlModifier)) {
- QTimer::singleShot(1000, this, &QWidget::show);
- }
+ // if (!(qApp->keyboardModifiers() & Qt::ControlModifier)) {
+ // QTimer::singleShot(1000, this, &QWidget::show);
+ // }
event->accept();
}
@@ -295,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) {
@@ -313,24 +321,6 @@
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();
- });
-#endif
#ifndef Q_OS_MAC
connect(windowBar, &QWK::WindowBar::minimizeRequested, this, &QWidget::showMinimized);
--
Gitblit v1.9.1