From 1900ef3c9805d7fe15e0634cef9b5ff2a5dc7838 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周三, 20 12月 2023 20:02:05 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/cocoawindowcontext.mm | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 9723d5a..c16c5a2 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -7,6 +7,7 @@
#include "qwkglobal_p.h"
#include "systemwindow_p.h"
+
namespace QWK {
struct NSWindowProxy {
@@ -221,6 +222,7 @@
static inline void releaseWindowProxy(const WId windowId) {
if (const auto proxy = g_proxyList()->take(windowId)) {
+ proxy->setSystemTitleBarVisible(true);
delete proxy;
}
}
@@ -384,7 +386,7 @@
const auto &key = *static_cast<const QString *>(args[0]);
const auto &newVar = *static_cast<const QVariant *>(args[1]);
const auto &oldVar = *static_cast<const QVariant *>(args[2]);
-
+
if (key == QStringLiteral("no-system-buttons")) {
if (newVar.toBool()) {
// TODO: set off
@@ -392,7 +394,7 @@
// TODO: set on
}
}
- break;
+ return;
}
default:
@@ -401,12 +403,19 @@
AbstractWindowContext::virtual_hook(id, data);
}
- void CocoaWindowContext::winIdChanged(QWindow *oldWindow) {
- releaseWindowProxy(windowId);
+ void CocoaWindowContext::winIdChanged(QWindow *oldWindow, bool isDestroyed) {
+ // 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