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 | 38 +++++++++++++++++++++++++++++++------- 1 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm index 9add515..d438001 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,24 +371,46 @@ void CocoaWindowContext::virtual_hook(int id, void *data) { switch (id) { - case ShowSystemMenuHook: - // TODO: mac system menu - return; - case SystemButtonAreaChangedHook: + 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 + } + } + return; + } + default: break; } 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); -- Gitblit v1.9.1