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 | 50 ++++++++++++++++++--------------------------------
1 files changed, 18 insertions(+), 32 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 67ca980..952fda9 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -7,14 +7,6 @@
namespace QWK {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- static const struct QWK_Hook {
- QWK_Hook() {
- qputenv("QT_MAC_WANTS_LAYER", "1");
- }
- } g_hook{};
-#endif
-
struct NSWindowProxy {
NSWindowProxy(NSWindow *macWindow) {
if (instances.contains(macWindow)) {
@@ -215,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()) {
@@ -231,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 {
@@ -267,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;
@@ -277,8 +262,8 @@
WindowItemDelegate *delegate = m_context->delegate();
auto me = static_cast<const QMouseEvent *>(event);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- QPoint scenePos = mouseEvent->scenePosition().toPoint();
- QPoint globalPos = mouseEvent->globalPosition().toPoint();
+ QPoint scenePos = me->scenePosition().toPoint();
+ QPoint globalPos = me->globalPosition().toPoint();
#else
QPoint scenePos = me->windowPos().toPoint();
QPoint globalPos = me->screenPos().toPoint();
@@ -376,7 +361,7 @@
}
CocoaWindowContext::~CocoaWindowContext() {
- // TODO: deref something?
+ releaseWindowProxy(windowId);
}
QString CocoaWindowContext::key() const {
@@ -397,14 +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();
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- m_windowHandle->setProperty("_q_mac_wantsLayer", 1);
-#endif
ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
- std::ignore = new CocoaWindowEventFilter(this, this);
- return true;
+ cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
}
}
--
Gitblit v1.9.1