diff options
| -rw-r--r-- | native/src/widget/text_input.rs | 4 | ||||
| -rw-r--r-- | native/src/widget/text_input/cursor.rs | 4 | ||||
| -rw-r--r-- | native/src/widget/text_input/editor.rs | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 3f415101..230fe7dc 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -329,7 +329,7 @@ where } keyboard::KeyCode::Backspace => { if platform::is_jump_modifier_pressed(modifiers) - && self.state.cursor.selection().is_none() + && self.state.cursor.selection(&self.value).is_none() { if self.is_secure { let cursor_pos = self.state.cursor.end(&self.value); @@ -349,7 +349,7 @@ where } keyboard::KeyCode::Delete => { if platform::is_jump_modifier_pressed(modifiers) - && self.state.cursor.selection().is_none() + && self.state.cursor.selection(&self.value).is_none() { if self.is_secure { let cursor_pos = self.state.cursor.end(&self.value); diff --git a/native/src/widget/text_input/cursor.rs b/native/src/widget/text_input/cursor.rs index 16e7a01b..aa03bb74 100644 --- a/native/src/widget/text_input/cursor.rs +++ b/native/src/widget/text_input/cursor.rs @@ -166,8 +166,8 @@ impl Cursor { end.min(value.len()) } - pub(crate) fn selection(&self) -> Option<(usize, usize)> { - match self.state { + pub(crate) fn selection(&self, value: &Value) -> Option<(usize, usize)> { + match self.state(value) { State::Selection { start, end } => { Some((start.min(end), start.max(end))) } diff --git a/native/src/widget/text_input/editor.rs b/native/src/widget/text_input/editor.rs index c9b9795d..20e42567 100644 --- a/native/src/widget/text_input/editor.rs +++ b/native/src/widget/text_input/editor.rs @@ -15,7 +15,7 @@ impl<'a> Editor<'a> { } pub fn insert(&mut self, character: char) { - match self.cursor.selection() { + match self.cursor.selection(self.value) { Some((left, right)) => { self.cursor.move_left(self.value); self.value.remove_many(left, right); @@ -30,7 +30,7 @@ impl<'a> Editor<'a> { pub fn paste(&mut self, content: Value) { let length = content.len(); - match self.cursor.selection() { + match self.cursor.selection(self.value) { Some((left, right)) => { self.cursor.move_left(self.value); self.value.remove_many(left, right); @@ -44,7 +44,7 @@ impl<'a> Editor<'a> { } pub fn backspace(&mut self) { - match self.cursor.selection() { + match self.cursor.selection(self.value) { Some((start, end)) => { self.cursor.move_left(self.value); self.value.remove_many(start, end); @@ -61,7 +61,7 @@ impl<'a> Editor<'a> { } pub fn delete(&mut self) { - match self.cursor.selection() { + match self.cursor.selection(self.value) { Some(_) => { self.backspace(); } |