From 273a92d1f72cd8d2204bdbaabc21cd1cdca52ebc Mon Sep 17 00:00:00 2001 From: shadow cat Date: Thu, 25 Sep 2025 14:32:20 -0400 Subject: [PATCH] decide it's better to leave them separate --- src/core/sense.rs | 1 - src/layout/event.rs | 15 ++------------- src/testing/mod.rs | 1 + 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/core/sense.rs b/src/core/sense.rs index 6676afb..ea225fb 100644 --- a/src/core/sense.rs +++ b/src/core/sense.rs @@ -149,7 +149,6 @@ pub trait SensorCtx: UiCtx { impl SensorCtx for Ctx { fn run_sensors(&mut self, cursor: &CursorState, window_size: Vec2) { SensorModule::::run(self, cursor, window_size); - SensorModule::::run(self.ui(), cursor, window_size); } } diff --git a/src/layout/event.rs b/src/layout/event.rs index 375d1c3..693da36 100644 --- a/src/layout/event.rs +++ b/src/layout/event.rs @@ -172,17 +172,7 @@ impl Default for DefaultEventModule { } impl Ui { - pub fn run_event( - ctx: &mut Ctx, - id: &WidgetId, - event: E, - data: E::Data, - ) { - Self::run_event_inner(ctx, id, event.clone(), data.clone()); - Self::run_event_inner(ctx.ui(), id, event, data); - } - - fn run_event_inner( + pub fn run_event( ctx: &mut Ctx, id: &WidgetId, event: E, @@ -205,7 +195,6 @@ pub trait EventCtx: UiCtx { impl EventCtx for Ctx { fn run_event(&mut self, id: &WidgetId, event: E, data: E::Data) { - Ui::run_event_inner(self, id, event.clone(), data.clone()); - Ui::run_event_inner(self.ui(), id, event, data); + Ui::run_event(self, id, event.clone(), data.clone()); } } diff --git a/src/testing/mod.rs b/src/testing/mod.rs index 6c6c53d..3813082 100644 --- a/src/testing/mod.rs +++ b/src/testing/mod.rs @@ -222,6 +222,7 @@ impl Client { if input_changed { let window_size = self.window_size(); self.run_sensors(&cursor_state, window_size); + self.ui.run_sensors(&cursor_state, window_size); } match event { WindowEvent::CloseRequested => event_loop.exit(),