From 6500aae0d32383a988aff9fb680d58a851012a14 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周一, 18 12月 2023 20:59:09 +0800
Subject: [PATCH] finish quick demo
---
src/core/contexts/cocoawindowcontext.mm | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 86f8597..952fda9 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -217,6 +217,12 @@
return it.value();
}
+ static inline void releaseWindowProxy(const WId windowId) {
+ if (const auto proxy = g_proxyList()->take(windowId)) {
+ delete proxy;
+ }
+ }
+
class CocoaWindowEventFilter : public QObject {
public:
explicit CocoaWindowEventFilter(AbstractWindowContext *context, QObject *parent = nullptr);
@@ -355,9 +361,7 @@
}
CocoaWindowContext::~CocoaWindowContext() {
- if (const auto proxy = g_proxyList()->take(windowId)) {
- delete proxy;
- }
+ releaseWindowProxy(windowId);
}
QString CocoaWindowContext::key() const {
@@ -378,11 +382,15 @@
AbstractWindowContext::virtual_hook(id, data);
}
- void CocoaWindowContext::winIdChanged(QWindow *oldWindow, bool destroyed) {
+ void CocoaWindowContext::winIdChanged(QWindow *oldWindow) {
+ releaseWindowProxy(windowId);
+ if (!m_windowHandle) {
+ return;
+ }
+
windowId = m_windowHandle->winId();
ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
- return true;
}
}
--
Gitblit v1.9.1