From d3d7430ec9afb94abaf78fa2c9edd9d9f946881c Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 18 12月 2023 01:29:07 +0800
Subject: [PATCH] Add QtContext WinIdChange workaround
---
src/core/contexts/cocoawindowcontext.mm | 184 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 159 insertions(+), 25 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 482f958..edd2c3a 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -7,18 +7,7 @@
namespace QWK {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- static const struct QWK_Hook {
- QWK_Hook() {
- qputenv("QT_MAC_WANTS_LAYER", "1");
- }
- } g_hook{};
-#endif
-
- class NSWindowProxy {
- Q_DISABLE_COPY(NSWindowProxy)
-
- public:
+ struct NSWindowProxy {
NSWindowProxy(NSWindow *macWindow) {
if (instances.contains(macWindow)) {
return;
@@ -31,7 +20,7 @@
}
}
- ~NSWindowProxy() override {
+ ~NSWindowProxy() {
instances.remove(nswindow);
if (instances.count() <= 0) {
restoreImplementations();
@@ -107,9 +96,10 @@
nswindow.hasShadow = YES;
nswindow.showsToolbarButton = NO;
nswindow.movableByWindowBackground = NO;
- //nswindow.movable = NO; // This line causes the window in the wrong position when become fullscreen.
- // For some unknown reason, we don't need the following hack in Qt versions below or
- // equal to 6.2.4.
+ nswindow.movable = NO; // This line causes the window in the wrong position when
+ // become fullscreen.
+ // For some unknown reason, we don't need the following hack in Qt versions below or
+ // equal to 6.2.4.
#if (QT_VERSION > QT_VERSION_CHECK(6, 2, 4))
[nswindow standardWindowButton:NSWindowCloseButton].hidden = (visible ? NO : YES);
[nswindow standardWindowButton:NSWindowMiniaturizeButton].hidden = (visible ? NO : YES);
@@ -184,6 +174,8 @@
}
private:
+ Q_DISABLE_COPY(NSWindowProxy)
+
NSWindow *nswindow = nil;
// NSEvent *lastMouseDownEvent = nil;
@@ -239,10 +231,145 @@
return it.value();
}
- CocoaWindowContext::CocoaWindowContext() {
+ class CocoaWindowEventFilter : public QObject {
+ public:
+ explicit CocoaWindowEventFilter(AbstractWindowContext *context, QObject *parent = nullptr);
+ ~CocoaWindowEventFilter() override;
+
+ enum WindowStatus {
+ Idle,
+ WaitingRelease,
+ PreparingMove,
+ Moving,
+ };
+
+ protected:
+ bool eventFilter(QObject *object, QEvent *event) override;
+
+ private:
+ AbstractWindowContext *m_context;
+ bool m_cursorShapeChanged;
+ WindowStatus m_windowStatus;
+ };
+
+ CocoaWindowEventFilter::CocoaWindowEventFilter(AbstractWindowContext *context, QObject *parent)
+ : QObject(parent), m_context(context), m_cursorShapeChanged(false), m_windowStatus(Idle) {
+ m_context->window()->installEventFilter(this);
+ }
+
+ CocoaWindowEventFilter::~CocoaWindowEventFilter() = default;
+
+ bool CocoaWindowEventFilter::eventFilter(QObject *obj, QEvent *event) {
+ Q_UNUSED(obj)
+ auto type = event->type();
+ 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 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
+ bool inTitleBar = m_context->isInTitleBarDraggableArea(scenePos);
+ switch (type) {
+ case QEvent::MouseButtonPress: {
+ switch (me->button()) {
+ case Qt::LeftButton: {
+ if (inTitleBar) {
+ // If we call startSystemMove() now but release the mouse without actual
+ // movement, there will be no MouseReleaseEvent, so we defer it when the
+ // mouse is actually moving for the first time
+ m_windowStatus = PreparingMove;
+ event->accept();
+ return true;
+ }
+ m_windowStatus = WaitingRelease;
+ break;
+ }
+ case Qt::RightButton: {
+ m_context->showSystemMenu(globalPos);
+ break;
+ }
+ default:
+ break;
+ }
+ break;
+ }
+
+ case QEvent::MouseButtonRelease: {
+ switch (m_windowStatus) {
+ case PreparingMove:
+ case Moving: {
+ m_windowStatus = Idle;
+ event->accept();
+ return true;
+ }
+ case WaitingRelease: {
+ m_windowStatus = Idle;
+ break;
+ }
+ default: {
+ if (inTitleBar) {
+ event->accept();
+ return true;
+ }
+ break;
+ }
+ }
+ break;
+ }
+
+ case QEvent::MouseMove: {
+ switch (m_windowStatus) {
+ case Moving: {
+ return true;
+ }
+ case PreparingMove: {
+ m_windowStatus = Moving;
+ window->startSystemMove();
+ event->accept();
+ return true;
+ }
+ default:
+ break;
+ }
+ break;
+ }
+
+ case QEvent::MouseButtonDblClick: {
+ if (me->button() == Qt::LeftButton && inTitleBar &&
+ !delegate->isHostSizeFixed(host)) {
+ Qt::WindowStates windowState = delegate->getWindowState(host);
+ if (!(windowState & Qt::WindowFullScreen)) {
+ if (windowState & Qt::WindowMaximized) {
+ delegate->setWindowState(host, windowState & ~Qt::WindowMaximized);
+ } else {
+ delegate->setWindowState(host, windowState | Qt::WindowMaximized);
+ }
+ event->accept();
+ return true;
+ }
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+ return false;
+ }
+
+ CocoaWindowContext::CocoaWindowContext() : AbstractWindowContext() {
}
CocoaWindowContext::~CocoaWindowContext() {
+ // TODO: deref something?
}
QString CocoaWindowContext::key() const {
@@ -250,16 +377,23 @@
}
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;
+ default:
+ break;
+ }
+ AbstractWindowContext::virtual_hook(id, data);
}
- bool CocoaWindowContext::setupHost() {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- m_windowHandle->setProperty("_q_mac_wantsLayer", 1);
-#endif
- WId winId = m_windowHandle->winId();
- ensureWindowProxy(winId)->setSystemTitleBarVisible(false);
- // Cache window ID
- windowId = winId;
+ void CocoaWindowContext::winIdChanged(QWindow *oldWindow, bool destroyed) {
+ windowId = m_windowHandle->winId();
+ ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
+ cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
return true;
}
--
Gitblit v1.9.1