From 54735199a4871ba511a433c6a68b883527f0dd11 Mon Sep 17 00:00:00 2001 From: Kyle Kelley Date: Tue, 12 Nov 2024 18:01:32 -0800 Subject: [PATCH] Be more explicit about BOOL (#20564) On x86 Macs BOOL is not the same within the `objc` crate we're using. This only comes up on nightly builds (not on CI), so I don't think I have a way to trigger this issue locally. Release Notes: - N/A --- crates/gpui/src/platform/mac/window.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs index f0a80a220769e0d051f2c1e5f2e0055a6594def7..e4ee30553875b57ca36269d64e0a295d5b70d081 100644 --- a/crates/gpui/src/platform/mac/window.rs +++ b/crates/gpui/src/platform/mac/window.rs @@ -1262,13 +1262,13 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent: } let mut callback = window_state.as_ref().lock().event_callback.take(); - let handled = if let Some(callback) = callback.as_mut() { + let handled: BOOL = if let Some(callback) = callback.as_mut() { !callback(PlatformInput::KeyDown(event)).propagate } else { - false + NO }; window_state.as_ref().lock().event_callback = callback; - return handled; + return handled as BOOL; } let mut callback = window_state.as_ref().lock().event_callback.take(); @@ -1279,7 +1279,7 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent: }; window_state.as_ref().lock().event_callback = callback; if handled { - return handled; + return YES; } if event.is_held { @@ -1289,9 +1289,9 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent: None, &event.keystroke.ime_key.unwrap_or(event.keystroke.key), ); - return true; + return YES; } - false + NO }); if handled == Some(true) { return YES;