From 364f4aec17e88adb5a0f3faad28176fc7cb89c74 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周四, 14 12月 2023 20:06:49 +0800
Subject: [PATCH] macos cleanup

---
 src/core/contexts/cocoawindowcontext.mm |   73 ++++++++++++------------------------
 1 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 5c654ce..482f958 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -15,8 +15,9 @@
     } g_hook{};
 #endif
 
-    class NSWindowProxy : public QObject {
-        Q_OBJECT
+    class NSWindowProxy {
+        Q_DISABLE_COPY(NSWindowProxy)
+
     public:
         NSWindowProxy(NSWindow *macWindow) {
             if (instances.contains(macWindow)) {
@@ -39,68 +40,52 @@
             nswindow = nil;
         }
 
-    public Q_SLOTS:
         void replaceImplementations() {
             Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
-            Q_ASSERT(method);
             oldSetStyleMask = reinterpret_cast<setStyleMaskPtr>(
                 method_setImplementation(method, reinterpret_cast<IMP>(setStyleMask)));
-            Q_ASSERT(oldSetStyleMask);
 
             method =
                 class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
-            Q_ASSERT(method);
             oldSetTitlebarAppearsTransparent =
                 reinterpret_cast<setTitlebarAppearsTransparentPtr>(method_setImplementation(
                     method, reinterpret_cast<IMP>(setTitlebarAppearsTransparent)));
-            Q_ASSERT(oldSetTitlebarAppearsTransparent);
 
 #if 0
-        method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
-        Q_ASSERT(method);
-        oldCanBecomeKeyWindow = reinterpret_cast<canBecomeKeyWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeKeyWindow)));
-        Q_ASSERT(oldCanBecomeKeyWindow);
+            method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
+            oldCanBecomeKeyWindow = reinterpret_cast<canBecomeKeyWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeKeyWindow)));
 
-        method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
-        Q_ASSERT(method);
-        oldCanBecomeMainWindow = reinterpret_cast<canBecomeMainWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeMainWindow)));
-        Q_ASSERT(oldCanBecomeMainWindow);
+            method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
+            oldCanBecomeMainWindow = reinterpret_cast<canBecomeMainWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeMainWindow)));
 #endif
 
             method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
-            Q_ASSERT(method);
             oldSendEvent = reinterpret_cast<sendEventPtr>(
                 method_setImplementation(method, reinterpret_cast<IMP>(sendEvent)));
-            Q_ASSERT(oldSendEvent);
         }
 
         void restoreImplementations() {
             Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
-            Q_ASSERT(method);
             method_setImplementation(method, reinterpret_cast<IMP>(oldSetStyleMask));
             oldSetStyleMask = nil;
 
             method =
                 class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
-            Q_ASSERT(method);
             method_setImplementation(method,
                                      reinterpret_cast<IMP>(oldSetTitlebarAppearsTransparent));
             oldSetTitlebarAppearsTransparent = nil;
 
 #if 0
-        method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
-        Q_ASSERT(method);
-        method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeKeyWindow));
-        oldCanBecomeKeyWindow = nil;
+            method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
+            method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeKeyWindow));
+            oldCanBecomeKeyWindow = nil;
 
-        method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
-        Q_ASSERT(method);
-        method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeMainWindow));
-        oldCanBecomeMainWindow = nil;
+            method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
+            method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeMainWindow));
+            oldCanBecomeMainWindow = nil;
 #endif
 
             method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
-            Q_ASSERT(method);
             method_setImplementation(method, reinterpret_cast<IMP>(oldSendEvent));
             oldSendEvent = nil;
         }
@@ -122,7 +107,7 @@
             nswindow.hasShadow = YES;
             nswindow.showsToolbarButton = NO;
             nswindow.movableByWindowBackground = NO;
-            nswindow.movable = 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.
 #if (QT_VERSION > QT_VERSION_CHECK(6, 2, 4))
@@ -183,18 +168,18 @@
             }
 
 #if 0
-        const auto nswindow = reinterpret_cast<NSWindow *>(obj);
-        const auto it = instances.find(nswindow);
-        if (it == instances.end()) {
-            return;
-        }
+            const auto nswindow = reinterpret_cast<NSWindow *>(obj);
+            const auto it = instances.find(nswindow);
+            if (it == instances.end()) {
+                return;
+            }
 
-        NSWindowProxy * const proxy = it.value();
-        if (event.type == NSEventTypeLeftMouseDown) {
-            proxy->lastMouseDownEvent = event;
-            QCoreApplication::processEvents();
-            proxy->lastMouseDownEvent = nil;
-        }
+            NSWindowProxy *proxy = it.value();
+            if (event.type == NSEventTypeLeftMouseDown) {
+                proxy->lastMouseDownEvent = event;
+                QCoreApplication::processEvents();
+                proxy->lastMouseDownEvent = nil;
+            }
 #endif
         }
 
@@ -227,9 +212,6 @@
 
     static inline NSWindow *mac_getNSWindow(const WId windowId) {
         const auto nsview = reinterpret_cast<NSView *>(windowId);
-        if (!nsview) {
-            return nil;
-        }
         return [nsview window];
     }
 
@@ -246,9 +228,6 @@
         auto it = g_proxyList()->find(windowId);
         if (it == g_proxyList()->end()) {
             NSWindow *nswindow = mac_getNSWindow(windowId);
-            if (!nswindow) {
-                return nil;
-            }
             const auto proxy = new NSWindowProxy(nswindow);
             it = g_proxyList()->insert(windowId, proxy);
         }
@@ -285,5 +264,3 @@
     }
 
 }
-
-#include "cocoawindowcontext.moc"
\ No newline at end of file

--
Gitblit v1.9.1