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

Fix impossible to type v in TextInput

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-01-22 14:30:40 +01:00
parent 416e0026c0
commit b544c90812
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 29 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

17
widget/src/text_input.rs
View file

@ -886,9 +886,9 @@ where
update_cache(state, value); update_cache(state, value);
} }
keyboard::Key::Character("v") => { keyboard::Key::Character("v")
if state.keyboard_modifiers.command() if state.keyboard_modifiers.command()
&& !state.keyboard_modifiers.alt() && !state.keyboard_modifiers.alt() =>
{ {
let content = match state.is_pasting.take() { let content = match state.is_pasting.take() {
Some(content) => content, Some(content) => content,
@ -904,8 +904,7 @@ where
} }
}; };
let mut editor = let mut editor = Editor::new(value, &mut state.cursor);
Editor::new(value, &mut state.cursor);
editor.paste(content.clone()); editor.paste(content.clone());
@ -919,9 +918,6 @@ where
state.is_pasting = Some(content); state.is_pasting = Some(content);
update_cache(state, value); update_cache(state, value);
} else {
state.is_pasting = None;
}
} }
keyboard::Key::Character("a") keyboard::Key::Character("a")
if state.keyboard_modifiers.command() => if state.keyboard_modifiers.command() =>
@ -945,12 +941,11 @@ where
} }
_ => { _ => {
if let Some(text) = text { if let Some(text) = text {
state.is_pasting = None;
let c = text.chars().next().unwrap_or_default(); let c = text.chars().next().unwrap_or_default();
if state.is_pasting.is_none() if !c.is_control() {
&& !state.keyboard_modifiers.command()
&& !c.is_control()
{
let mut editor = let mut editor =
Editor::new(value, &mut state.cursor); Editor::new(value, &mut state.cursor);