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 | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 34fdcb2..edd2c3a 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -6,17 +6,6 @@
#include <QtGui/QGuiApplication>
namespace QWK {
- // ### FIXME FIXME FIXME
- // ### FIXME: Tell the user to call in the documentation, instead of automatically
- // calling it directly.
- // ### FIXME FIXME FIXME
-#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
struct NSWindowProxy {
NSWindowProxy(NSWindow *macWindow) {
@@ -270,7 +259,8 @@
CocoaWindowEventFilter::~CocoaWindowEventFilter() = default;
- bool CocoaWindowEventFilter::eventFilter(QObject *object, QEvent *event) {
+ bool CocoaWindowEventFilter::eventFilter(QObject *obj, QEvent *event) {
+ Q_UNUSED(obj)
auto type = event->type();
if (type < QEvent::MouseButtonPress || type > QEvent::MouseMove) {
return false;
@@ -280,8 +270,8 @@
WindowItemDelegate *delegate = m_context->delegate();
auto me = static_cast<const QMouseEvent *>(event);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- QPoint scenePos = mouseEvent->scenePosition().toPoint();
- QPoint globalPos = mouseEvent->globalPosition().toPoint();
+ QPoint scenePos = me->scenePosition().toPoint();
+ QPoint globalPos = me->globalPosition().toPoint();
#else
QPoint scenePos = me->windowPos().toPoint();
QPoint globalPos = me->screenPos().toPoint();
@@ -400,13 +390,10 @@
AbstractWindowContext::virtual_hook(id, data);
}
- bool CocoaWindowContext::setupHost() {
+ void CocoaWindowContext::winIdChanged(QWindow *oldWindow, bool destroyed) {
windowId = m_windowHandle->winId();
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- m_windowHandle->setProperty("_q_mac_wantsLayer", 1);
-#endif
ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
- std::ignore = new CocoaWindowEventFilter(this, this);
+ cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
return true;
}
--
Gitblit v1.9.1