From fd27e059f03e6c03269f429df964cb0da5052c20 Mon Sep 17 00:00:00 2001 From: Keith Simmons Date: Sun, 27 Jun 2021 07:50:43 -0700 Subject: [PATCH] fix another issue --- src/window/window_wrapper/keyboard_manager.rs | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/window/window_wrapper/keyboard_manager.rs b/src/window/window_wrapper/keyboard_manager.rs index daae06d..66d5c83 100644 --- a/src/window/window_wrapper/keyboard_manager.rs +++ b/src/window/window_wrapper/keyboard_manager.rs @@ -165,19 +165,27 @@ impl KeyboardManager { self.command_sender .send(UiCommand::Keyboard(keybinding_string)) .expect("Could not send keyboard ui command"); - } else if let Some(key_text) = key_event.text_with_all_modifiers() { - // This is not a control key, so we rely upon winit to determine if - // this is a deadkey or not. - let keybinding_string = - if let Some(escaped_text) = is_special(key_text) { - self.format_keybinding_string(true, false, escaped_text) - } else { - self.format_keybinding_string(false, false, key_text) - }; - - self.command_sender - .send(UiCommand::Keyboard(keybinding_string)) - .expect("Could not send keyboard ui command"); + } else { + let key_text = if self.alt && cfg!(target_os = "macos") { + key_event.text_with_all_modifiers() + } else { + key_event.text + }; + + if let Some(key_text) = key_text { + // This is not a control key, so we rely upon winit to determine if + // this is a deadkey or not. + let keybinding_string = + if let Some(escaped_text) = is_special(key_text) { + self.format_keybinding_string(true, false, escaped_text) + } else { + self.format_keybinding_string(false, false, key_text) + }; + + self.command_sender + .send(UiCommand::Keyboard(keybinding_string)) + .expect("Could not send keyboard ui command"); + } } } }