Convert `mouse::State` into `mouse::Click`

2 files changed, 76 insertions, 63 deletions

diff --git a/native/src/input/mouse.rs b/native/src/input/mouse.rs
index ca3daeb1..7198b233 100644
--- a/native/src/input/mouse.rs
+++ b/native/src/input/mouse.rs
@@ -2,68 +2,8 @@
 mod button;
 mod event;
 
-use crate::Point;
+pub mod click;
+
 pub use button::Button;
+pub use click::Click;
 pub use event::{Event, ScrollDelta};
-use std::time::{Duration, SystemTime};
-
-/// enum to track the type of the last click
-#[derive(Debug, Copy, Clone)]
-pub enum Interaction {
-    /// Last Click was a single click
-    Click(Point),
-    /// Last Click was a double click
-    DoubleClick(Point),
-    /// Last Click was a triple click
-    TripleClick(Point),
-}
-
-/// Compiler bully
-#[derive(Debug, Copy, Clone)]
-pub struct State {
-    last_click: Option<Interaction>,
-    last_click_timestamp: Option<SystemTime>,
-}
-
-impl Default for State {
-    fn default() -> Self {
-        State {
-            last_click: None,
-            last_click_timestamp: None,
-        }
-    }
-}
-
-impl State {
-    /// processes left click to check for double/triple clicks
-    /// return amount of repetitive mouse clicks as enum
-    pub fn update(&mut self, position: Point) -> Interaction {
-        self.last_click = match self.last_click {
-            None => Some(Interaction::Click(position)),
-            Some(x) => match x {
-                Interaction::Click(p) if self.process_click(p, position) => {
-                    Some(Interaction::DoubleClick(position))
-                }
-                Interaction::DoubleClick(p)
-                    if self.process_click(p, position) =>
-                {
-                    Some(Interaction::TripleClick(position))
-                }
-                _ => Some(Interaction::Click(position)),
-            },
-        };
-        self.last_click_timestamp = Some(SystemTime::now());
-        self.last_click.unwrap_or(Interaction::Click(position))
-    }
-
-    fn process_click(&self, old_position: Point, new_position: Point) -> bool {
-        old_position == new_position
-            && SystemTime::now()
-                .duration_since(
-                    self.last_click_timestamp.unwrap_or(SystemTime::UNIX_EPOCH),
-                )
-                .unwrap_or(Duration::from_secs(1))
-                .as_millis()
-                <= 500
-    }
-}
diff --git a/native/src/input/mouse/click.rs b/native/src/input/mouse/click.rs
new file mode 100644
index 00000000..60ae056b
--- /dev/null
+++ b/native/src/input/mouse/click.rs
@@ -0,0 +1,73 @@
+//! Track mouse clicks.
+use crate::Point;
+use std::time::Instant;
+
+/// A mouse click.
+#[derive(Debug, Clone, Copy)]
+pub struct Click {
+    kind: Kind,
+    position: Point,
+    time: Instant,
+}
+
+/// The kind of mouse click.
+#[derive(Debug, Clone, Copy)]
+pub enum Kind {
+    /// A single click
+    Single,
+
+    /// A double click
+    Double,
+
+    /// A triple click
+    Triple,
+}
+
+impl Kind {
+    fn next(&self) -> Kind {
+        match self {
+            Kind::Single => Kind::Double,
+            Kind::Double => Kind::Triple,
+            Kind::Triple => Kind::Double,
+        }
+    }
+}
+
+impl Click {
+    /// Creates a new [`Click`] with the given position and previous last
+    /// [`Click`].
+    ///
+    /// [`Click`]: struct.Click.html
+    pub fn new(position: Point, previous: Option<Click>) -> Click {
+        let time = Instant::now();
+
+        let kind = if let Some(previous) = previous {
+            if previous.is_consecutive(position, time) {
+                previous.kind.next()
+            } else {
+                Kind::Single
+            }
+        } else {
+            Kind::Single
+        };
+
+        Click {
+            kind,
+            position,
+            time,
+        }
+    }
+
+    /// Returns the [`Kind`] of [`Click`].
+    ///
+    /// [`Kind`]: enum.Kind.html
+    /// [`Click`]: struct.Click.html
+    pub fn kind(&self) -> Kind {
+        self.kind
+    }
+
+    fn is_consecutive(&self, new_position: Point, time: Instant) -> bool {
+        self.position == new_position
+            && time.duration_since(self.time).as_millis() <= 300
+    }
+}