Merge pull request #325 from hecrj/feature/canvas-interaction

Canvas interactivity and Game of Life example

4 files changed, 7 insertions, 12 deletions

diff --git a/native/src/input/mouse.rs b/core/src/mouse.rs
index 7198b233..25ce6ac3 100644
--- a/native/src/input/mouse.rs
+++ b/core/src/mouse.rs
@@ -1,9 +1,8 @@
-//! Build mouse events.
+//! Reuse basic mouse types.
 mod button;
 mod event;
-
-pub mod click;
+mod interaction;
 
 pub use button::Button;
-pub use click::Click;
 pub use event::{Event, ScrollDelta};
+pub use interaction::Interaction;
diff --git a/native/src/input/mouse/button.rs b/core/src/mouse/button.rs
index aeb8a55d..aeb8a55d 100644
--- a/native/src/input/mouse/button.rs
+++ b/core/src/mouse/button.rs
diff --git a/native/src/input/mouse/event.rs b/core/src/mouse/event.rs
index aafc4fe3..2f07b207 100644
--- a/native/src/input/mouse/event.rs
+++ b/core/src/mouse/event.rs
@@ -1,5 +1,4 @@
 use super::Button;
-use crate::input::ButtonState;
 
 /// A mouse event.
 ///
@@ -24,14 +23,11 @@ pub enum Event {
         y: f32,
     },
 
-    /// A mouse button was pressed or released.
-    Input {
-        /// The state of the button
-        state: ButtonState,
+    /// A mouse button was pressed.
+    ButtonPressed(Button),
 
-        /// The button identifier
-        button: Button,
-    },
+    /// A mouse button was released.
+    ButtonReleased(Button),
 
     /// The mouse wheel was scrolled.
     WheelScrolled {
diff --git a/native/src/input/mouse/click.rs b/native/src/mouse/click.rs
index d27bc67e..d27bc67e 100644
--- a/native/src/input/mouse/click.rs
+++ b/native/src/mouse/click.rs