From 44fee9aa1e3087635d1394612c6f6ceab44ba7b0 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周一, 18 12月 2023 20:11:42 +0800
Subject: [PATCH] minor improve quick demo
---
src/core/contexts/cocoawindowcontext.mm | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 1845599..952fda9 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -207,15 +207,6 @@
return [nsview window];
}
- static inline void cleanupProxy() {
- if (g_proxyList()->isEmpty()) {
- return;
- }
- const auto &data = *g_proxyList();
- qDeleteAll(data);
- g_proxyList()->clear();
- }
-
static inline NSWindowProxy *ensureWindowProxy(const WId windowId) {
auto it = g_proxyList()->find(windowId);
if (it == g_proxyList()->end()) {
@@ -223,12 +214,13 @@
const auto proxy = new NSWindowProxy(nswindow);
it = g_proxyList()->insert(windowId, proxy);
}
- static bool cleanerInstalled = false;
- if (!cleanerInstalled) {
- cleanerInstalled = true;
- qAddPostRoutine(cleanupProxy);
- }
return it.value();
+ }
+
+ static inline void releaseWindowProxy(const WId windowId) {
+ if (const auto proxy = g_proxyList()->take(windowId)) {
+ delete proxy;
+ }
}
class CocoaWindowEventFilter : public QObject {
@@ -259,7 +251,8 @@
CocoaWindowEventFilter::~CocoaWindowEventFilter() = default;
- bool CocoaWindowEventFilter::eventFilter(QObject *object, QEvent *event) {
+ bool CocoaWindowEventFilter::eventFilter(QObject *obj, QEvent *event) {
+ Q_UNUSED(obj)
auto type = event->type();
if (type < QEvent::MouseButtonPress || type > QEvent::MouseMove) {
return false;
@@ -368,7 +361,7 @@
}
CocoaWindowContext::~CocoaWindowContext() {
- // TODO: deref something?
+ releaseWindowProxy(windowId);
}
QString CocoaWindowContext::key() const {
@@ -389,11 +382,15 @@
AbstractWindowContext::virtual_hook(id, data);
}
- bool CocoaWindowContext::setupHost() {
+ void CocoaWindowContext::winIdChanged(QWindow *oldWindow) {
+ releaseWindowProxy(windowId);
+ if (!m_windowHandle) {
+ return;
+ }
+
windowId = m_windowHandle->winId();
ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
- std::ignore = new CocoaWindowEventFilter(this, this);
- return true;
+ cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
}
}
--
Gitblit v1.9.1