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

Merge pull request #2278 from iced-rs/prioritize-text-insertion

Browse source 
Prioritize text insertion in `TextInput` and `TextEditor`
This commit is contained in:
Héctor Ramón 2024-02-21 13:21:39 +01:00 • committed by GitHub
commit 6c00e615b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Documentation for `horizontal_space` and `vertical_space` helpers. [#2265](https://github.com/iced-rs/iced/pull/2265)
- WebAssembly platform. [#2271](https://github.com/iced-rs/iced/pull/2271)
- Decouple `Key` from `keyboard::Modifiers` and apply them to `text` in `KeyboardInput`. [#2238](https://github.com/iced-rs/iced/pull/2238)
- Text insertion not being prioritized in `TextInput` and `TextEditor`. [#2278](https://github.com/iced-rs/iced/pull/2278)
Many thanks to...

15
widget/src/text_editor.rs
View file

@ -686,6 +686,13 @@ impl Update {
text,
..
} if state.is_focused => {
if let Some(text) = text {
if let Some(c) = text.chars().find(|c| !c.is_control())
{
return edit(Edit::Insert(c));
}
}
if let keyboard::Key::Named(named_key) = key.as_ref() {
if let Some(motion) = motion(named_key) {
let motion = if platform::is_jump_modifier_pressed(
@ -732,13 +739,7 @@ impl Update {
{
Some(Self::Paste)
}
_ => {
let text = text?;
edit(Edit::Insert(
text.chars().next().unwrap_or_default(),
))
}
_ => None,
}
}
_ => None,

45
widget/src/text_input.rs
View file

@ -762,6 +762,27 @@ where
let modifiers = state.keyboard_modifiers;
focus.updated_at = Instant::now();
if let Some(text) = text {
state.is_pasting = None;
let c = text.chars().next().unwrap_or_default();
if !c.is_control() {
let mut editor = Editor::new(value, &mut state.cursor);
editor.insert(c);
let message = (on_input)(editor.contents());
shell.publish(message);
focus.updated_at = Instant::now();
update_cache(state, value);
return event::Status::Captured;
}
}
match key.as_ref() {
keyboard::Key::Named(key::Named::Enter) => {
if let Some(on_submit) = on_submit.clone() {
@ -944,29 +965,7 @@ where
) => {
return event::Status::Ignored;
}
_ => {
if let Some(text) = text {
state.is_pasting = None;
let c = text.chars().next().unwrap_or_default();
if !c.is_control() {
let mut editor =
Editor::new(value, &mut state.cursor);
editor.insert(c);
let message = (on_input)(editor.contents());
shell.publish(message);
focus.updated_at = Instant::now();
update_cache(state, value);
return event::Status::Captured;
}
}
}
_ => {}
}
return event::Status::Captured;