mirror of
https://github.com/zed-industries/zed.git
synced 2024-09-20 02:47:34 +03:00
Fix multi-key shortcuts (#4025)
An old fix was ported over from gpui1, and the two fixes could not exist side-by-side. Delete this code and let the keymap handle it Release Notes: - (Added|Fixed|Improved) ... ([#<public_issue_number_if_exists>](https://github.com/zed-industries/community/issues/<public_issue_number_if_exists>)).
This commit is contained in:
commit
4d66ade332
@ -1095,37 +1095,7 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
|
|||||||
.flatten()
|
.flatten()
|
||||||
.is_some();
|
.is_some();
|
||||||
if !is_composing {
|
if !is_composing {
|
||||||
// if the IME has changed the key, we'll first emit an event with the character
|
handled = callback(InputEvent::KeyDown(event));
|
||||||
// generated by the IME system; then fallback to the keystroke if that is not
|
|
||||||
// handled.
|
|
||||||
// cases that we have working:
|
|
||||||
// - " on a brazillian layout by typing <quote><space>
|
|
||||||
// - ctrl-` on a brazillian layout by typing <ctrl-`>
|
|
||||||
// - $ on a czech QWERTY layout by typing <alt-4>
|
|
||||||
// - 4 on a czech QWERTY layout by typing <shift-4>
|
|
||||||
// - ctrl-4 on a czech QWERTY layout by typing <ctrl-alt-4> (or <ctrl-shift-4>)
|
|
||||||
if ime_text.is_some() && ime_text.as_ref() != Some(&event.keystroke.key) {
|
|
||||||
let event_with_ime_text = KeyDownEvent {
|
|
||||||
is_held: false,
|
|
||||||
keystroke: Keystroke {
|
|
||||||
// we match ctrl because some use-cases need it.
|
|
||||||
// we don't match alt because it's often used to generate the optional character
|
|
||||||
// we don't match shift because we're not here with letters (usually)
|
|
||||||
// we don't match cmd/fn because they don't seem to use IME
|
|
||||||
modifiers: Default::default(),
|
|
||||||
key: ime_text.clone().unwrap(),
|
|
||||||
ime_key: None,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
handled = callback(InputEvent::KeyDown(event_with_ime_text));
|
|
||||||
}
|
|
||||||
if !handled {
|
|
||||||
// empty key happens when you type a deadkey in input composition.
|
|
||||||
// (e.g. on a brazillian keyboard typing quote is a deadkey)
|
|
||||||
if !event.keystroke.key.is_empty() {
|
|
||||||
handled = callback(InputEvent::KeyDown(event));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if !handled {
|
if !handled {
|
||||||
|
Loading…
Reference in New Issue
Block a user