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

Use modified_key for single key bindings in text_input and text_editor

Browse source 
Co-authored-by: Basti Widua <seppel3210@gmail.com>
This commit is contained in:
Héctor Ramón Jiménez 2025-11-29 09:15:19 +01:00
parent 07c6234c0e
commit 4ba180319a
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

41
widget/src/text_editor.rs
View file

@ -1142,8 +1142,14 @@ pub enum Binding<Message> {
/// A key press.
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct KeyPress {
/// The key pressed.
/// The original key pressed without modifiers applied to it.
///
/// You should use this key for combinations (e.g. Ctrl+C).
pub key: keyboard::Key,
/// The key pressed with modifiers applied to it.
///
/// You should use this key for any single key bindings (e.g. motions).
pub modified_key: keyboard::Key,
/// The state of the keyboard modifiers.
pub modifiers: keyboard::Modifiers,
/// The text produced by the key press.
@ -1157,6 +1163,7 @@ impl<Message> Binding<Message> {
pub fn from_key_press(event: KeyPress) -> Option<Self> {
let KeyPress {
key,
modified_key,
modifiers,
text,
status,
@ -1169,17 +1176,7 @@ impl<Message> Binding<Message> {
#[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) => {
Some(Self::Backspace)
}
keyboard::Key::Named(key::Named::Delete)
if text.is_none() || text.as_deref() == Some("\u{7f}") =>
{
Some(Self::Delete)
}
keyboard::Key::Named(key::Named::Escape) => Some(Self::Unfocus),
let combination = match key.as_ref() {
keyboard::Key::Character("c") if modifiers.command() => {
Some(Self::Copy)
}
@ -1194,6 +1191,24 @@ impl<Message> Binding<Message> {
keyboard::Key::Character("a") if modifiers.command() => {
Some(Self::SelectAll)
}
_ => None,
};
if let Some(binding) = combination {
return Some(binding);
}
match modified_key.as_ref() {
keyboard::Key::Named(key::Named::Enter) => Some(Self::Enter),
keyboard::Key::Named(key::Named::Backspace) => {
Some(Self::Backspace)
}
keyboard::Key::Named(key::Named::Delete)
if text.is_none() || text.as_deref() == Some("\u{7f}") =>
{
Some(Self::Delete)
}
keyboard::Key::Named(key::Named::Escape) => Some(Self::Unfocus),
_ => {
if let Some(text) = text {
let c = text.chars().find(|c| !c.is_control())?;
@ -1332,6 +1347,7 @@ impl<Message> Update<Message> {
},
Event::Keyboard(keyboard::Event::KeyPressed {
key,
modified_key,
modifiers,
text,
..
@ -1346,6 +1362,7 @@ impl<Message> Update<Message> {
let key_press = KeyPress {
key: key.clone(),
modified_key: modified_key.clone(),
modifiers: *modifiers,
text: text.clone(),
status,

7
widget/src/text_input.rs
View file

@ -899,7 +899,10 @@ where
}
}
Event::Keyboard(keyboard::Event::KeyPressed {
key, text, ..
key,
text,
modified_key,
..
}) => {
let state = state::<Renderer>(tree);
@ -1040,7 +1043,7 @@ where
key, modifiers,
);
match key.as_ref() {
match modified_key.as_ref() {
keyboard::Key::Named(key::Named::Enter) => {
if let Some(on_submit) = self.on_submit.clone() {
shell.publish(on_submit);