From 4273df8b2505a3e7d201113ac63dd29335eccfe1 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 21 5月 2024 18:00:24 +0800
Subject: [PATCH] minor tweaks
---
examples/mainwindow/mainwindow.cpp | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index c704812..696b907 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -42,7 +42,7 @@
};
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
- installWindowAgent();
+ installWindowAgent();
#if 1
auto clockWidget = new ClockWidget();
@@ -59,6 +59,8 @@
setWindowTitle(tr("Example MainWindow"));
resize(800, 600);
+
+ setFixedHeight(600);
// windowAgent->centralize();
}
@@ -105,15 +107,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;
}
@@ -303,14 +309,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