From c229915e9d4b2818155f3650869726fdcbe7e21d Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: ćšć, 21 12æ 2023 14:12:26 +0800
Subject: [PATCH] Prepare to add mica
---
src/core/contexts/cocoawindowcontext.mm | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 79ad85e..d438001 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -371,11 +371,6 @@
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;
@@ -403,12 +398,19 @@
AbstractWindowContext::virtual_hook(id, data);
}
- void CocoaWindowContext::winIdChanged(QWindow *oldWindow, bool isDestroyed) {
- releaseWindowProxy(windowId);
+ void CocoaWindowContext::winIdChanged() {
+ // If the original window id is valid, remove all resources related
+ if (windowId) {
+ releaseWindowProxy(windowId);
+ windowId = 0;
+ cocoaWindowEventFilter.reset();
+ }
+
if (!m_windowHandle) {
return;
}
+ // Allocate new resources
windowId = m_windowHandle->winId();
ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
--
Gitblit v1.9.1