remove typed stuff / just specify rsc if needed

src/default/sense.rs

@@ -26,14 +26,15 @@ pub enum CursorSense {
 pub struct CursorSenses(Vec<CursorSense>);
 
 impl Event for CursorSenses {
-    type Data<'a> = CursorData<'a>;
+    type Data = CursorData;
     type State = SensorState;
-    fn should_run(&self, data: &mut Self::Data<'_>) -> bool {
-        if let Some(sense) = should_run(self, data.cursor, data.hover) {
+    fn should_run(&self, data: &Self::Data) -> Option<Self::Data> {
+        if let Some(sense) = should_run(self, &data.cursor, data.hover) {
+            let mut data = data.clone();
             data.sense = sense;
-            true
+            Some(data)
         } else {
-            false
+            None
         }
     }
 }
@@ -127,23 +128,24 @@ pub struct SensorState {
     pub hover: ActivationState,
 }
 
-pub struct CursorData<'a> {
+#[derive(Clone)]
+pub struct CursorData {
     /// where this widget was hit
     pub pos: Vec2,
     pub size: Vec2,
     pub scroll_delta: Vec2,
     pub hover: ActivationState,
-    pub cursor: &'a CursorState,
+    pub cursor: CursorState,
     /// the first sense that triggered this
     pub sense: CursorSense,
 }
 
 pub trait SensorUi<Rsc: HasEvents> {
-    fn run_sensors(&mut self, state: &mut Rsc::State, cursor: &CursorState, window_size: Vec2);
+    fn run_sensors(&mut self, state: &mut Rsc::State, cursor: CursorState, window_size: Vec2);
 }
 
 impl<Rsc: HasEvents> SensorUi<Rsc> for Rsc {
-    fn run_sensors(&mut self, state: &mut Rsc::State, cursor: &CursorState, window_size: Vec2) {
+    fn run_sensors(&mut self, state: &mut Rsc::State, cursor: CursorState, window_size: Vec2) {
         let layers = std::mem::take(&mut self.ui_mut().layers);
         let mut active = std::mem::take(&mut self.events_mut().get_type::<CursorSense>().active);
         for layer in layers.indices().rev() {
@@ -158,7 +160,9 @@ impl<Rsc: HasEvents> SensorUi<Rsc> for Rsc {
                 }
                 sensed = true;
 
-                let mut data = CursorData {
+                let cursor = cursor.clone();
+
+                let data = CursorData {
                     pos: cursor.pos - region.top_left,
                     size: region.bot_right - region.top_left,
                     scroll_delta: cursor.scroll_delta,
@@ -168,7 +172,7 @@ impl<Rsc: HasEvents> SensorUi<Rsc> for Rsc {
                     // might wanna set up Event to have a prepare stage
                     sense: CursorSense::Hovering,
                 };
-                self.run_event::<CursorSense>(*id, &mut data, state);
+                self.run_event::<CursorSense>(*id, data, state);
             }
             if sensed {
                 break;