From a5d13e19dd7f6037e10b649c49805922ae5e0fa6 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周五, 22 12月 2023 17:04:29 +0800
Subject: [PATCH] Prepare to remove style support again
---
src/core/contexts/cocoawindowcontext.mm | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 9723d5a..949681d 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;
}
}
@@ -369,30 +371,9 @@
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;
- }
-
- case WindowAttributeChangedHook: {
- auto args = static_cast<void **>(data);
- 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
- } else {
- // TODO: set on
- }
- }
- break;
}
default:
@@ -401,15 +382,35 @@
AbstractWindowContext::virtual_hook(id, data);
}
- void CocoaWindowContext::winIdChanged(QWindow *oldWindow) {
- 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);
}
+ bool CocoaWindowContext::windowAttributeChanged(const QString &key, const QVariant &attribute,
+ const QVariant &oldAttribute) {
+ if (key == QStringLiteral("no-system-buttons")) {
+ if (attribute.toBool()) {
+ // TODO: set off
+ } else {
+ // TODO: set on
+ }
+ return true;
+ }
+ return false;
+ }
+
}
--
Gitblit v1.9.1