redo event fn signature & add event_ctx macro

src/core/sense.rs

@@ -166,20 +166,21 @@ impl<Ctx> CursorModule<Ctx> {
     }
 }
 
-pub trait SensorCtx: UiCtx {
-    fn run_sensors(&mut self, cursor: &CursorState, window_size: Vec2);
-}
-
-impl<Ctx: UiCtx + 'static> SensorCtx for Ctx {
-    fn run_sensors(&mut self, cursor: &CursorState, window_size: Vec2) {
-        CursorModule::<Ctx>::run(self, cursor, window_size);
+impl Ui {
+    pub fn run_sensors<Ctx: 'static>(
+        &mut self,
+        ctx: &mut Ctx,
+        cursor: &CursorState,
+        window_size: Vec2,
+    ) {
+        CursorModule::<Ctx>::run(self, ctx, cursor, window_size);
     }
 }
 
-impl<Ctx: UiCtx + 'static> CursorModule<Ctx> {
-    pub fn run(ctx: &mut Ctx, cursor: &CursorState, window_size: Vec2) {
-        let layers = std::mem::take(&mut ctx.ui().data.layers);
-        let mut module = std::mem::take(ctx.ui().data.modules.get_mut::<Self>());
+impl<Ctx: 'static> CursorModule<Ctx> {
+    pub fn run(ui: &mut Ui, ctx: &mut Ctx, cursor: &CursorState, window_size: Vec2) {
+        let layers = std::mem::take(&mut ui.data.layers);
+        let mut module = std::mem::take(ui.data.modules.get_mut::<Self>());
 
         for i in layers.indices().rev() {
             let Some(list) = module.active.get_mut(&i) else {
@@ -204,7 +205,7 @@ impl<Ctx: UiCtx + 'static> CursorModule<Ctx> {
                             scroll_delta: cursor.scroll_delta,
                             sense,
                         };
-                        (sensor.f)(ctx, data);
+                        (sensor.f)(EventCtx { ui, state: ctx, data });
                     }
                 }
             }
@@ -213,10 +214,10 @@ impl<Ctx: UiCtx + 'static> CursorModule<Ctx> {
             }
         }
 
-        let ui_mod = ctx.ui().data.modules.get_mut::<Self>();
+        let ui_mod = ui.data.modules.get_mut::<Self>();
         std::mem::swap(ui_mod, &mut module);
         ui_mod.merge(module);
-        ctx.ui().data.layers = layers;
+        ui.data.layers = layers;
     }
 }
 
@@ -305,7 +306,11 @@ impl<E: Event<Data = <CursorSenses as Event>::Data> + Into<CursorSenses>, Ctx: '
         });
     }
 
-    fn run<'a>(&self, id: &Id, event: E) -> Option<impl Fn(&mut Ctx, E::Data) + use<'a, E, Ctx>> {
+    fn run<'a>(
+        &self,
+        id: &Id,
+        event: E,
+    ) -> Option<impl Fn(EventCtx<Ctx, <E as Event>::Data>) + use<'a, E, Ctx>> {
         let senses = event.into();
         if let Some(group) = self.map.get(id) {
             let fs: Vec<_> = group
@@ -319,9 +324,13 @@ impl<E: Event<Data = <CursorSenses as Event>::Data> + Into<CursorSenses>, Ctx: '
                     }
                 })
                 .collect();
-            Some(move |ctx: &mut Ctx, data: CursorData| {
+            Some(move |ctx: EventCtx<Ctx, CursorData>| {
                 for f in &fs {
-                    f(ctx, data.clone());
+                    f(EventCtx {
+                        state: ctx.state,
+                        ui: ctx.ui,
+                        data: ctx.data.clone(),
+                    });
                 }
             })
         } else {