From efee8bcfb260d1ae25cce08bb8815ef86e1cc9df Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周日, 17 12月 2023 18:09:09 +0800
Subject: [PATCH] minor fixes
---
src/core/contexts/cocoawindowcontext.mm | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index aec1f20..388c5b8 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -6,7 +6,10 @@
#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() {
@@ -104,8 +107,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 +280,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,6 +387,17 @@
}
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() {
--
Gitblit v1.9.1