Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare explicitly to YES/NO instead relying on booliness for objc (#20567)

Browse source 
Just x86_64-apple-darwin things. Fixes the build for nightly.

Release Notes:

- N/A
This commit is contained in:
Kyle Kelley 2024-11-12 18:35:58 -08:00 • committed by GitHub
parent 54735199a4
commit 0547748c48
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/gpui/src/platform/mac/window.rs
View file

@ -1257,13 +1257,13 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
msg_send![input_context, handleEvent: native_event] msg_send![input_context, handleEvent: native_event]
}; };
window_state.as_ref().lock().keystroke_for_do_command.take(); window_state.as_ref().lock().keystroke_for_do_command.take();
if handled { if handled == YES {
return YES; return YES;
} }
let mut callback = window_state.as_ref().lock().event_callback.take(); let mut callback = window_state.as_ref().lock().event_callback.take();
let handled: BOOL = if let Some(callback) = callback.as_mut() { let handled: BOOL = if let Some(callback) = callback.as_mut() {
!callback(PlatformInput::KeyDown(event)).propagate !callback(PlatformInput::KeyDown(event)).propagate as BOOL
} else { } else {
NO NO
}; };
@ -1273,12 +1273,12 @@ 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 mut callback = window_state.as_ref().lock().event_callback.take();
let handled = if let Some(callback) = callback.as_mut() { let handled = if let Some(callback) = callback.as_mut() {
!callback(PlatformInput::KeyDown(event.clone())).propagate !callback(PlatformInput::KeyDown(event.clone())).propagate as BOOL
} else { } else {
false NO
}; };
window_state.as_ref().lock().event_callback = callback; window_state.as_ref().lock().event_callback = callback;
if handled { if handled == YES {
return YES; return YES;
} }
@ -1293,7 +1293,7 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
} }
NO NO
}); });
if handled == Some(true) { if handled == Some(YES) {
return YES; return YES;
} }
} }