Fix ctrl-` on Brazillian too

Conrad Irwin created

Change summary

crates/gpui/src/platform/mac/window.rs | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)

Detailed changes

crates/gpui/src/platform/mac/window.rs 🔗

@@ -991,13 +991,21 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
                     // if the IME has changed the key, we'll first emit an event with the character
                     // generated by the IME system; then fallback to the keystroke if that is not
                     // handled.
-                    // (e.g. on a brazillian keyboard to type a quote you type quote then space)
-                    // (e.g. on a czech keyboard typing a $ requires option+shift+4)
+                    // 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 {
-                                ctrl: false,
+                                // 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
+                                ctrl: event.keystroke.ctrl,
                                 alt: false,
                                 shift: false,
                                 cmd: false,