From d522300857fd6d321e657381799804960f7f1678 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周日, 17 12月 2023 18:55:03 +0800
Subject: [PATCH] remove unused workarounds
---
src/core/contexts/cocoawindowcontext.mm | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index aec1f20..1845599 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -7,14 +7,6 @@
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
-
struct NSWindowProxy {
NSWindowProxy(NSWindow *macWindow) {
if (instances.contains(macWindow)) {
@@ -104,8 +96,8 @@
nswindow.hasShadow = YES;
nswindow.showsToolbarButton = NO;
nswindow.movableByWindowBackground = NO;
- // nswindow.movable = NO; // This line causes the window in the wrong position when
- // become fullscreen.
+ 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))
@@ -277,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();
@@ -384,13 +376,21 @@
}
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() {
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