From 326b23bf678301a72cb9d67ac64347dd5ce49a37 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周一, 18 12月 2023 14:27:11 +0800
Subject: [PATCH] optimize mac again
---
src/core/contexts/cocoawindowcontext.mm | 60 +++++++++++++++++++++++++++---------------------------------
1 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index aec1f20..a8673b8 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)) {
@@ -104,8 +96,8 @@
nswindow.hasShadow = YES;
nswindow.showsToolbarButton = NO;
nswindow.movableByWindowBackground = NO;
- // nswindow.movable = NO; // This line causes the window in the wrong position when
- // become fullscreen.
+ nswindow.movable = NO; // This line causes the window in the wrong position when
+ // become fullscreen.
// For some unknown reason, we don't need the following hack in Qt versions below or
// equal to 6.2.4.
#if (QT_VERSION > QT_VERSION_CHECK(6, 2, 4))
@@ -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 {
@@ -384,15 +369,24 @@
}
void CocoaWindowContext::virtual_hook(int id, void *data) {
+ switch (id) {
+ case ShowSystemMenuHook:
+ // TODO: mac system menu
+ return;
+ case SystemButtonAreaChangedHook:
+ // TODO: mac system button rect updated
+ return;
+ default:
+ break;
+ }
+ AbstractWindowContext::virtual_hook(id, data);
}
- bool CocoaWindowContext::setupHost() {
+ void CocoaWindowContext::winIdChanged(QWindow *oldWindow, bool destroyed) {
+ releaseWindowProxy(windowId);
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);
+ cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
return true;
}
--
Gitblit v1.9.1