me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Keep unary motion function in text_editor

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-05-31 16:10:59 +02:00
parent bd48946b02
commit 8cfa8149f5
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
widget/src/text_editor.rs
View file

@ -767,7 +767,19 @@ impl Update {
} }
if let keyboard::Key::Named(named_key) = key.as_ref() { if let keyboard::Key::Named(named_key) = key.as_ref() {
if let Some(motion) = motion(named_key, modifiers) { if let Some(motion) = motion(named_key) {
let motion = if platform::is_macos_command_pressed(
modifiers,
) {
match motion {
Motion::Left => Motion::Home,
Motion::Right => Motion::End,
_ => motion,
}
} else {
motion
};
let motion = if platform::is_jump_modifier_pressed( let motion = if platform::is_jump_modifier_pressed(
modifiers, modifiers,
) { ) {
@ -793,26 +805,14 @@ impl Update {
} }
} }
fn motion(key: key::Named, modifiers: keyboard::Modifiers) -> Option<Motion> { fn motion(key: key::Named) -> Option<Motion> {
match key { match key {
key::Named::Home => Some(Motion::Home), key::Named::ArrowLeft => Some(Motion::Left),
key::Named::End => Some(Motion::End), key::Named::ArrowRight => Some(Motion::Right),
key::Named::ArrowLeft => {
if platform::is_macos_command_pressed(modifiers) {
Some(Motion::Home)
} else {
Some(Motion::Left)
}
}
key::Named::ArrowRight => {
if platform::is_macos_command_pressed(modifiers) {
Some(Motion::End)
} else {
Some(Motion::Right)
}
}
key::Named::ArrowUp => Some(Motion::Up), key::Named::ArrowUp => Some(Motion::Up),
key::Named::ArrowDown => Some(Motion::Down), key::Named::ArrowDown => Some(Motion::Down),
key::Named::Home => Some(Motion::Home),
key::Named::End => Some(Motion::End),
key::Named::PageUp => Some(Motion::PageUp), key::Named::PageUp => Some(Motion::PageUp),
key::Named::PageDown => Some(Motion::PageDown), key::Named::PageDown => Some(Motion::PageDown),
_ => None, _ => None,