From 187f82bb4065589fa7fba5f6fa9bd51113357a2c Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周一, 18 12月 2023 14:29:35 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/cocoawindowcontext.mm | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 86f8597..614f055 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,13 @@
AbstractWindowContext::virtual_hook(id, data);
}
- void CocoaWindowContext::winIdChanged(QWindow *oldWindow, bool destroyed) {
+ void CocoaWindowContext::winIdChanged(QWindow *oldWindow) {
+ if (windowId) {
+ releaseWindowProxy(windowId);
+ }
windowId = m_windowHandle->winId();
ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
- return true;
}
}
--
Gitblit v1.9.1