leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2801 from rhysd/mac-specific-shortcuts

Browse source 
Implement macOS-specific key shortcuts with `Control` modifier for text input
This commit is contained in:
Héctor 2025-11-21 00:25:53 +01:00 • committed by GitHub
commit 4ffb4a79f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 38 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

33
widget/src/text_editor.rs
View file

@ -1148,6 +1148,9 @@ impl<Message> Binding<Message> {
return None;
}
#[cfg(target_os = "macos")]
let key = convert_macos_shortcut(&key, modifiers);
match key.as_ref() {
keyboard::Key::Named(key::Named::Enter) => Some(Self::Enter),
keyboard::Key::Named(key::Named::Backspace) => {
@ -1454,3 +1457,33 @@ pub fn default(theme: &Theme, status: Status) -> Style {
},
}
}
#[cfg(target_os = "macos")]
pub(crate) fn convert_macos_shortcut(
key: &keyboard::Key,
modifiers: keyboard::Modifiers,
) -> &keyboard::Key {
if modifiers != keyboard::Modifiers::CTRL {
return key;
}
match key.as_ref() {
keyboard::Key::Character("b") => {
&keyboard::Key::Named(key::Named::ArrowLeft)
}
keyboard::Key::Character("f") => {
&keyboard::Key::Named(key::Named::ArrowRight)
}
keyboard::Key::Character("a") => {
&keyboard::Key::Named(key::Named::Home)
}
keyboard::Key::Character("e") => &keyboard::Key::Named(key::Named::End),
keyboard::Key::Character("h") => {
&keyboard::Key::Named(key::Named::Backspace)
}
keyboard::Key::Character("d") => {
&keyboard::Key::Named(key::Named::Delete)
}
_ => key,
}
}

5
widget/src/text_input.rs
View file

@ -1009,6 +1009,11 @@ where
}
}
#[cfg(target_os = "macos")]
let key = crate::text_editor::convert_macos_shortcut(
key, modifiers,
);
match key.as_ref() {
keyboard::Key::Named(key::Named::Enter) => {
if let Some(on_submit) = self.on_submit.clone() {