From 38700ac4e6864e94a5435b19b803282bac2f6f5b Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周日, 17 12月 2023 22:35:17 +0800 Subject: [PATCH] Add TODO encounting a new bug --- src/core/contexts/cocoawindowcontext.mm | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm index 34fdcb2..1845599 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) { @@ -280,8 +269,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(); @@ -402,9 +391,6 @@ bool CocoaWindowContext::setupHost() { 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); return true; -- Gitblit v1.9.1