From fe50d30edcc31618905ec3e3dc39c8b78cee49db Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周二, 19 12月 2023 18:09:23 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/cocoawindowcontext.mm | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index a8673b8..9add515 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;
}
@@ -382,12 +381,15 @@
AbstractWindowContext::virtual_hook(id, data);
}
- void CocoaWindowContext::winIdChanged(QWindow *oldWindow, bool destroyed) {
+ void CocoaWindowContext::winIdChanged(QWindow *oldWindow) {
releaseWindowProxy(windowId);
+ if (!m_windowHandle) {
+ return;
+ }
+
windowId = m_windowHandle->winId();
ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
- return true;
}
}
--
Gitblit v1.9.1