From a5372ac566469efb59e6cfb29a695021c7c3528d Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周三, 20 12月 2023 00:53:42 +0800 Subject: [PATCH] Add TODO --- src/core/contexts/cocoawindowcontext.mm | 53 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm index 614f055..9723d5a 100644 --- a/src/core/contexts/cocoawindowcontext.mm +++ b/src/core/contexts/cocoawindowcontext.mm @@ -5,6 +5,8 @@ #include <QtGui/QGuiApplication> +#include "qwkglobal_p.h" +#include "systemwindow_p.h" namespace QWK { struct NSWindowProxy { @@ -257,17 +259,14 @@ 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); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - QPoint scenePos = me->scenePosition().toPoint(); - QPoint globalPos = me->globalPosition().toPoint(); -#else - QPoint scenePos = me->windowPos().toPoint(); - QPoint globalPos = me->screenPos().toPoint(); -#endif + + QPoint scenePos = getMouseEventScenePos(me); + QPoint globalPos = getMouseEventGlobalPos(me); + bool inTitleBar = m_context->isInTitleBarDraggableArea(scenePos); switch (type) { case QEvent::MouseButtonPress: { @@ -281,7 +280,6 @@ event->accept(); return true; } - m_windowStatus = WaitingRelease; break; } case Qt::RightButton: { @@ -291,6 +289,7 @@ default: break; } + m_windowStatus = WaitingRelease; break; } @@ -324,7 +323,7 @@ } case PreparingMove: { m_windowStatus = Moving; - window->startSystemMove(); + startSystemMove(window); event->accept(); return true; } @@ -370,12 +369,32 @@ 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 + } + } + break; + } + default: break; } @@ -383,9 +402,11 @@ } void CocoaWindowContext::winIdChanged(QWindow *oldWindow) { - if (windowId) { - releaseWindowProxy(windowId); + releaseWindowProxy(windowId); + if (!m_windowHandle) { + return; } + windowId = m_windowHandle->winId(); ensureWindowProxy(windowId)->setSystemTitleBarVisible(false); cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this); -- Gitblit v1.9.1