minor tweaks

SineStriker

2023-12-20 1900ef3c9805d7fe15e0634cef9b5ff2a5dc7838

 src/core/contexts/cocoawindowcontext.mm

@@ -6,6 +6,7 @@
#include <QtGui/QGuiApplication>

#include "qwkglobal_p.h"
#include "systemwindow_p.h"

namespace QWK {

@@ -221,6 +222,7 @@

    static inline void releaseWindowProxy(const WId windowId) {
        if (const auto proxy = g_proxyList()->take(windowId)) {
            proxy->setSystemTitleBarVisible(true);
            delete proxy;
        }
    }
@@ -259,9 +261,9 @@
        if (type < QEvent::MouseButtonPress || type > QEvent::MouseMove) {
            return false;
        }
        QObject *host = m_context->host();
        QWindow *window = m_context->window();
        WindowItemDelegate *delegate = m_context->delegate();
        auto host = m_context->host();
        auto window = m_context->window();
        auto delegate = m_context->delegate();
        auto me = static_cast<const QMouseEvent *>(event);

        QPoint scenePos = getMouseEventScenePos(me);
@@ -323,7 +325,7 @@
                    }
                    case PreparingMove: {
                        m_windowStatus = Moving;
                        window->startSystemMove();
                        startSystemMove(window);
                        event->accept();
                        return true;
                    }
@@ -369,24 +371,51 @@

    void CocoaWindowContext::virtual_hook(int id, void *data) {
        switch (id) {
            case ShowSystemMenuHook:
            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(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);