From 524b4acc6d5c9f7bc48603eaf09c2eb86cf29fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Fri, 21 Nov 2025 00:10:14 +0100 Subject: [PATCH] Simplify `convert_macos_shortcut` a bit in `text_input` --- widget/src/text_input.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs index f76cacec..7d730989 100644 --- a/widget/src/text_input.rs +++ b/widget/src/text_input.rs @@ -1792,25 +1792,25 @@ fn convert_macos_shortcut( key: &keyboard::Key, modifiers: keyboard::Modifiers, ) -> &keyboard::Key { - let control = - modifiers.control() && !modifiers.alt() && !modifiers.command(); + if modifiers != keyboard::Modifiers::CTRL { + return key; + } + match key.as_ref() { - keyboard::Key::Character("b") if control => { + keyboard::Key::Character("b") => { &keyboard::Key::Named(key::Named::ArrowLeft) } - keyboard::Key::Character("f") if control => { + keyboard::Key::Character("f") => { &keyboard::Key::Named(key::Named::ArrowRight) } - keyboard::Key::Character("a") if control => { + keyboard::Key::Character("a") => { &keyboard::Key::Named(key::Named::Home) } - keyboard::Key::Character("e") if control => { - &keyboard::Key::Named(key::Named::End) - } - keyboard::Key::Character("h") if control => { + keyboard::Key::Character("e") => &keyboard::Key::Named(key::Named::End), + keyboard::Key::Character("h") => { &keyboard::Key::Named(key::Named::Backspace) } - keyboard::Key::Character("d") if control => { + keyboard::Key::Character("d") => { &keyboard::Key::Named(key::Named::Delete) } _ => key,