From 503d6461cde51aefeea73fc956264cbc815e9c14 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周三, 20 12月 2023 19:44:59 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/cocoawindowcontext.mm | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 9add515..79ad85e 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -7,6 +7,7 @@
#include "qwkglobal_p.h"
#include "systemwindow_p.h"
+
namespace QWK {
struct NSWindowProxy {
@@ -221,6 +222,7 @@
static inline void releaseWindowProxy(const WId windowId) {
if (const auto proxy = g_proxyList()->take(windowId)) {
+ proxy->setSystemTitleBarVisible(true);
delete proxy;
}
}
@@ -369,24 +371,44 @@
void CocoaWindowContext::virtual_hook(int id, void *data) {
switch (id) {
- case ShowSystemMenuHook:
+ case ShowSystemMenuHook: {
// TODO: mac system menu
return;
- case SystemButtonAreaChangedHook:
+ }
+
+ case SystemButtonAreaChangedHook: {
// TODO: mac system button rect updated
return;
+ }
+
+ case WindowAttributeChangedHook: {
+ auto args = static_cast<void **>(data);
+ const auto &key = *static_cast<const QString *>(args[0]);
+ const auto &newVar = *static_cast<const QVariant *>(args[1]);
+ const auto &oldVar = *static_cast<const QVariant *>(args[2]);
+
+ if (key == QStringLiteral("no-system-buttons")) {
+ if (newVar.toBool()) {
+ // TODO: set off
+ } else {
+ // TODO: set on
+ }
+ }
+ return;
+ }
+
default:
break;
}
AbstractWindowContext::virtual_hook(id, data);
}
- void CocoaWindowContext::winIdChanged(QWindow *oldWindow) {
+ void CocoaWindowContext::winIdChanged(QWindow *oldWindow, bool isDestroyed) {
releaseWindowProxy(windowId);
if (!m_windowHandle) {
return;
}
-
+
windowId = m_windowHandle->winId();
ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
--
Gitblit v1.9.1