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

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

diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 9add515..96dbe65 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,30 @@
 
     void CocoaWindowContext::virtual_hook(int id, void *data) {
         switch (id) {
-            case ShowSystemMenuHook:
-                // TODO: mac system menu
-                return;
-            case SystemButtonAreaChangedHook:
+            case SystemButtonAreaChangedHook: {
                 // TODO: mac system button rect updated
                 return;
+            }
+
             default:
                 break;
         }
         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