Add Mouse Button to Click struct

iced-rs · Apr 30, 2024 · 750ecd9 · 750ecd9
1 parent 24501fd
commit 750ecd9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/core/src/mouse/click.rs b/core/src/mouse/click.rs
@@ -1,11 +1,13 @@
 //! Track mouse clicks.
+use crate::mouse::Button;
 use crate::time::Instant;
 use crate::Point;
 
 /// A mouse click.
 #[derive(Debug, Clone, Copy)]
 pub struct Click {
     kind: Kind,
+    button: Button,
     position: Point,
     time: Instant,
 }
@@ -36,11 +38,11 @@ impl Kind {
 impl Click {
     /// Creates a new [`Click`] with the given position and previous last
     /// [`Click`].
-    pub fn new(position: Point, previous: Option<Click>) -> Click {
+    pub fn new(position: Point, button: Button, previous: Option<Click>) -> Click {
         let time = Instant::now();
 
         let kind = if let Some(previous) = previous {
-            if previous.is_consecutive(position, time) {
+            if previous.is_consecutive(position, time) && button == previous.button {
                 previous.kind.next()
             } else {
                 Kind::Single
@@ -51,6 +53,7 @@ impl Click {
 
         Click {
             kind,
+            button,
             position,
             time,
         }

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
@@ -683,6 +683,7 @@ impl Update {
 
                         let click = mouse::Click::new(
                             cursor_position,
+                            mouse::Button::Left,
                             state.last_click,
                         );
 

diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
@@ -601,7 +601,7 @@ where
                     let target = cursor_position.x - text_layout.bounds().x;
 
                     let click =
-                        mouse::Click::new(cursor_position, state.last_click);
+                        mouse::Click::new(cursor_position, mouse::Button::Left, state.last_click);
 
                     match click.kind() {
                         click::Kind::Single => {