8000 native/macos: Fix key up events when command key is pressed by Pewnack · Pull Request #626 · not-fl3/miniquad · GitHub
[go: up one dir, main page]
Skip to content

native/macos: Fix key up events when command key is pressed #626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
not-fl3 merged 1 commit into from
May 20, 2026
Merged

native/macos: Fix key up events when command key is pressed #626

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/native/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -1322,13 +1337,19 @@ 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 {
let event: ObjcId = msg_send![ns_app, nextEventMatchingMask: NSEventMask::NSAnyEventMask untilDate: distant_past inMode:NSDefaultRunLoopMode dequeue:YES];
if event == nil {
break;
}
display.generate_swallowed_key_events(event);

let () = msg_send![ns_app, sendEvent:event];
}
}
Expand Down
Loading
0