From 21971e0037c2ddcb96fd48ea96332445de4137bb Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 10 Mar 2021 01:59:02 +0100
Subject: Make `Clipboard` argument in `Widget` trait mutable

---
 native/src/widget/text_input/cursor.rs | 21 ++++++++++++---------
 native/src/widget/text_input/value.rs  |  9 +++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'native/src/widget/text_input')

diff --git a/native/src/widget/text_input/cursor.rs b/native/src/widget/text_input/cursor.rs
index e630e293..1e7aee83 100644
--- a/native/src/widget/text_input/cursor.rs
+++ b/native/src/widget/text_input/cursor.rs
@@ -48,6 +48,18 @@ impl Cursor {
         }
     }
 
+    /// Returns the current selection of the [`Cursor`] for the given [`Value`].
+    ///
+    /// `start` is guaranteed to be <= than `end`.
+    pub fn selection(&self, value: &Value) -> Option<(usize, usize)> {
+        match self.state(value) {
+            State::Selection { start, end } => {
+                Some((start.min(end), start.max(end)))
+            }
+            _ => None,
+        }
+    }
+
     pub(crate) fn move_to(&mut self, position: usize) {
         self.state = State::Index(position);
     }
@@ -161,15 +173,6 @@ impl Cursor {
         end.min(value.len())
     }
 
-    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)))
-            }
-            _ => None,
-        }
-    }
-
     fn left(&self, value: &Value) -> usize {
         match self.state(value) {
             State::Index(index) => index,
diff --git a/native/src/widget/text_input/value.rs b/native/src/widget/text_input/value.rs
index 86be2790..2034cca4 100644
--- a/native/src/widget/text_input/value.rs
+++ b/native/src/widget/text_input/value.rs
@@ -73,6 +73,15 @@ impl Value {
             .unwrap_or(self.len())
     }
 
+    /// Returns a new [`Value`] containing the graphemes from `start` until the
+    /// given `end`.
+    pub fn select(&self, start: usize, end: usize) -> Self {
+        let graphemes =
+            self.graphemes[start.min(self.len())..end.min(self.len())].to_vec();
+
+        Self { graphemes }
+    }
+
     /// Returns a new [`Value`] containing the graphemes until the given
     /// `index`.
     pub fn until(&self, index: usize) -> Self {
-- 
cgit 


From 983aa1b3665c6b546700767d21d73de72372ddad Mon Sep 17 00:00:00 2001
From: Dispersia <dispersias@gmail.com>
Date: Mon, 12 Apr 2021 23:23:47 -0700
Subject: Run cargo fmt

---
 native/src/widget/text_input/cursor.rs | 4 ++--
 native/src/widget/text_input/editor.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'native/src/widget/text_input')

diff --git a/native/src/widget/text_input/cursor.rs b/native/src/widget/text_input/cursor.rs
index 1e7aee83..4f3b159b 100644
--- a/native/src/widget/text_input/cursor.rs
+++ b/native/src/widget/text_input/cursor.rs
@@ -113,7 +113,7 @@ impl Cursor {
             State::Selection { start, end } if end > 0 => {
                 self.select_range(start, end - 1)
             }
-            _ => (),
+            _ => {}
         }
     }
 
@@ -125,7 +125,7 @@ impl Cursor {
             State::Selection { start, end } if end < value.len() => {
                 self.select_range(start, end + 1)
             }
-            _ => (),
+            _ => {}
         }
     }
 
diff --git a/native/src/widget/text_input/editor.rs b/native/src/widget/text_input/editor.rs
index 20e42567..0b50a382 100644
--- a/native/src/widget/text_input/editor.rs
+++ b/native/src/widget/text_input/editor.rs
@@ -20,7 +20,7 @@ impl<'a> Editor<'a> {
                 self.cursor.move_left(self.value);
                 self.value.remove_many(left, right);
             }
-            _ => (),
+            _ => {}
         }
 
         self.value.insert(self.cursor.end(self.value), character);
@@ -35,7 +35,7 @@ impl<'a> Editor<'a> {
                 self.cursor.move_left(self.value);
                 self.value.remove_many(left, right);
             }
-            _ => (),
+            _ => {}
         }
 
         self.value.insert_many(self.cursor.end(self.value), content);
-- 
cgit