From be703385249bafd679a125efc1477ff166e2c9e2 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周四, 21 12月 2023 17:08:40 +0800
Subject: [PATCH] minor tweaks

---
 src/core/contexts/cocoawindowcontext.mm |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 9723d5a..560e2b5 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,11 +371,6 @@
 
     void CocoaWindowContext::virtual_hook(int id, void *data) {
         switch (id) {
-            case ShowSystemMenuHook: {
-                // TODO: mac system menu
-                return;
-            }
-
             case SystemButtonAreaChangedHook: {
                 // TODO: mac system button rect updated
                 return;
@@ -384,15 +381,17 @@
                 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]);
-                
+                auto &res = *static_cast<bool *>(args[3]);
+
                 if (key == QStringLiteral("no-system-buttons")) {
                     if (newVar.toBool()) {
                         // TODO: set off
                     } else {
                         // TODO: set on
                     }
+                    res = true;
                 }
-                break;
+                return;
             }
 
             default:
@@ -401,12 +400,19 @@
         AbstractWindowContext::virtual_hook(id, data);
     }
 
-    void CocoaWindowContext::winIdChanged(QWindow *oldWindow) {
-        releaseWindowProxy(windowId);
+    void CocoaWindowContext::winIdChanged() {
+        // If the original window id is valid, remove all resources related
+        if (windowId) {
+            releaseWindowProxy(windowId);
+            windowId = 0;
+            cocoaWindowEventFilter.reset();
+        }
+
         if (!m_windowHandle) {
             return;
         }
 
+        // Allocate new resources
         windowId = m_windowHandle->winId();
         ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
         cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);

--
Gitblit v1.9.1