From 669ea85c57567624e687d92898266f78bb55f1fa Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 20 12月 2023 22:30:54 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/cocoawindowcontext.mm | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 5011e28..69ed562 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;
}
}
@@ -401,12 +403,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