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
This commit is contained in:
parent
466d3316a0
commit
54735199a4
1 changed files with 6 additions and 6 deletions
|
@ -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 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
|
!callback(PlatformInput::KeyDown(event)).propagate
|
||||||
} else {
|
} else {
|
||||||
false
|
NO
|
||||||
};
|
};
|
||||||
window_state.as_ref().lock().event_callback = callback;
|
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();
|
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;
|
window_state.as_ref().lock().event_callback = callback;
|
||||||
if handled {
|
if handled {
|
||||||
return handled;
|
return YES;
|
||||||
}
|
}
|
||||||
|
|
||||||
if event.is_held {
|
if event.is_held {
|
||||||
|
@ -1289,9 +1289,9 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
|
||||||
None,
|
None,
|
||||||
&event.keystroke.ime_key.unwrap_or(event.keystroke.key),
|
&event.keystroke.ime_key.unwrap_or(event.keystroke.key),
|
||||||
);
|
);
|
||||||
return true;
|
return YES;
|
||||||
}
|
}
|
||||||
false
|
NO
|
||||||
});
|
});
|
||||||
if handled == Some(true) {
|
if handled == Some(true) {
|
||||||
return YES;
|
return YES;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue