From 7e132b345cc2b2515838c387a76ccc9f29705ba6 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 19 12月 2023 03:12:59 +0800
Subject: [PATCH] Add fallback to qt window context
---
src/core/contexts/cocoawindowcontext.mm | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index edd2c3a..76ff231 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -5,6 +5,8 @@
#include <QtGui/QGuiApplication>
+#include "qwkglobal_p.h"
+
namespace QWK {
struct NSWindowProxy {
@@ -207,15 +209,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 +216,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 {
@@ -269,13 +263,10 @@
QWindow *window = m_context->window();
WindowItemDelegate *delegate = m_context->delegate();
auto me = static_cast<const QMouseEvent *>(event);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- QPoint scenePos = me->scenePosition().toPoint();
- QPoint globalPos = me->globalPosition().toPoint();
-#else
- QPoint scenePos = me->windowPos().toPoint();
- QPoint globalPos = me->screenPos().toPoint();
-#endif
+
+ QPoint scenePos = getMouseEventScenePos(me);
+ QPoint globalPos = getMouseEventGlobalPos(me);
+
bool inTitleBar = m_context->isInTitleBarDraggableArea(scenePos);
switch (type) {
case QEvent::MouseButtonPress: {
@@ -289,7 +280,6 @@
event->accept();
return true;
}
- m_windowStatus = WaitingRelease;
break;
}
case Qt::RightButton: {
@@ -299,6 +289,7 @@
default:
break;
}
+ m_windowStatus = WaitingRelease;
break;
}
@@ -369,7 +360,7 @@
}
CocoaWindowContext::~CocoaWindowContext() {
- // TODO: deref something?
+ releaseWindowProxy(windowId);
}
QString CocoaWindowContext::key() const {
@@ -390,11 +381,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