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

Improve safety of Cursor::selection

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-07-10 23:59:49 +02:00
parent 855c0faa59
commit a1210c9dae
3 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
native/src/widget/text_input/editor.rs
View file

@ -15,12 +15,10 @@ impl<'a> Editor<'a> {
}
pub fn insert(&mut self, character: char) {
match self.cursor.selection() {
match self.cursor.selection(self.value) {
Some((left, right)) => {
if left < self.value.len() {
self.cursor.move_left(self.value);
self.value.remove_many(left, right.min(self.value.len()));
}
self.cursor.move_left(self.value);
self.value.remove_many(left, right.min(self.value.len()));
}
_ => (),
}
@ -32,12 +30,10 @@ 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)) => {
if left < self.value.len() {
self.cursor.move_left(self.value);
self.value.remove_many(left, right.min(self.value.len()));
}
self.cursor.move_left(self.value);
self.value.remove_many(left, right.min(self.value.len()));
}
_ => (),
}
@ -48,12 +44,10 @@ impl<'a> Editor<'a> {
}
pub fn backspace(&mut self) {
match self.cursor.selection() {
match self.cursor.selection(self.value) {
Some((start, end)) => {
if start < self.value.len() {
self.cursor.move_left(self.value);
self.value.remove_many(start, end.min(self.value.len()));
}
self.cursor.move_left(self.value);
self.value.remove_many(start, end.min(self.value.len()));
}
None => {
let start = self.cursor.start(self.value);
@ -67,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();
}