Sine Striker
2023-12-21 c229915e9d4b2818155f3650869726fdcbe7e21d
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,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;
@@ -401,12 +398,19 @@
        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);