From fdc3a770c5d76d095fe8ae9e1496f9ee21a4441a Mon Sep 17 00:00:00 2001
From: Pewnack <2773860+Pewnack@users.noreply.github.com>
Date: Mon, 27 Apr 2026 07:49:59 +0200
Subject: [PATCH] On macOS when the command key (super key) is pressed all key
 up events are swallowd.

Co-authored-by: Copilot <copilot@github.com>
---
 src/native/macos.rs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/native/macos.rs b/src/native/macos.rs
index 29b3e2ef7..191dd08c6 100644
--- a/src/native/macos.rs
+++ b/src/native/macos.rs
@@ -131,6 +131,21 @@ impl MacosDisplay {
 
         Some(event_handler)
     }
+
+    // When the command key is pressed (super key), macOS swallows all key up events.
+    fn generate_swallowed_key_events(&mut self, event: ObjcId) {
+        let event_type: u64 = unsafe { msg_send![event, type] };
+        if event_type == NSEventType::NSKeyUp as u64 {
+            let mods = get_event_key_modifier(event);
+            if mods.logo {
+                if let Some(key) = get_event_keycode(event) {
+                    if let Some(event_handler) = self.context() {
+                        event_handler.key_up_event(key, mods);
+                    }
+                }
+            }
+        }
+    }
 }
 
 impl MacosDisplay {
@@ -1322,6 +1337,10 @@ where
         if block_on_wait {
             let event: ObjcId = msg_send![ns_app, nextEventMatchingMask: NSEventMask::NSAnyEventMask untilDate: distant_future inMode:NSDefaultRunLoopMode dequeue:YES];
 
+            if event != nil {
+                display.generate_swallowed_key_events(event);
+            }
+
             let () = msg_send![ns_app, sendEvent:event];
         } else {
             loop {
@@ -1329,6 +1348,8 @@ where
                 if event == nil {
                     break;
                 }
+                display.generate_swallowed_key_events(event);
+
                 let () = msg_send![ns_app, sendEvent:event];
             }
         }