Changes as per linebender#831 (comment)

sjoshid · Apr 26, 2020 · f27be6f · f27be6f
1 parent 06914ff
commit f27be6f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/druid/src/contexts.rs b/druid/src/contexts.rs
@@ -44,8 +44,6 @@ pub struct EventCtx<'a> {
     pub(crate) focus_widget: Option<WidgetId>,
     pub(crate) is_handled: bool,
     pub(crate) is_root: bool,
-    /// Map of TimerTokens and WidgetIds that requested them.
-    pub(crate) timers: &'a HashMap<TimerToken, WidgetId>,
 }
 
 /// A mutable context provided to the [`lifecycle`] method on widgets.

diff --git a/druid/src/core.rs b/druid/src/core.rs
@@ -455,7 +455,6 @@ impl<T: Data, W: Widget<T>> WidgetPod<T, W> {
             is_handled: false,
             is_root: false,
             focus_widget: ctx.focus_widget,
-            timers: &ctx.timers,
         };
 
         let rect = child_ctx.base_state.layout_rect.unwrap_or_default();
@@ -495,6 +494,15 @@ impl<T: Data, W: Widget<T>> WidgetPod<T, W> {
                         }
                     }
                 }
+                InternalEvent::RouteTimer(token, widget_id) => {
+                    let widget_id = *widget_id;
+                    if widget_id != child_ctx.base_state.id {
+                        recurse = child_ctx.base_state.children.may_contain(&widget_id);
+                        Event::Internal(InternalEvent::RouteTimer(*token, widget_id))
+                    } else {
+                        Event::Timer(*token)
+                    }
+                }
             },
             Event::WindowConnected => Event::WindowConnected,
             Event::WindowSize(size) => {
@@ -571,15 +579,7 @@ impl<T: Data, W: Widget<T>> WidgetPod<T, W> {
                 Event::Zoom(*zoom)
             }
             Event::Timer(id) => {
-                if let Some(widget_id) = child_ctx.timers.get(id) {
-                    if *widget_id != child_ctx.base_state.id {
-                        recurse = child_ctx.base_state.children.may_contain(widget_id);
-                    }
-                } else {
-                    log::error!("Timer Token must be in timers map.");
-                    recurse = false;
-                }
-                Event::Timer(*id)
+                panic!("We cannot be here");
             }
             Event::Command(cmd) => Event::Command(cmd.clone()),
         };

diff --git a/druid/src/event.rs b/druid/src/event.rs
@@ -147,6 +147,7 @@ pub enum InternalEvent {
     MouseLeave,
     /// A command still in the process of being dispatched.
     TargetedCommand(Target, Command),
+    RouteTimer(TimerToken, WidgetId),
 }
 
 /// Application life cycle events.

diff --git a/druid/src/window.rs b/druid/src/window.rs
@@ -172,6 +172,14 @@ impl<T: Data> Window<T> {
                 let scale = 96.0 / dpi;
                 self.size = Size::new(size.width * scale, size.height * scale);
                 Event::WindowSize(self.size)
+            },
+            Event::Timer(token) => {
+                if let Some(widget_id) = self.timers.get(&token) {
+                    Event::Internal(InternalEvent::RouteTimer(token, *widget_id))
+                } else {
+                    log::error!("No widget found for timer {:?}", token);
+                    return false;
+                }
             }
             other => other,
         };
@@ -197,15 +205,13 @@ impl<T: Data> Window<T> {
                 window: &self.handle,
                 window_id: self.id,
                 focus_widget: self.focus,
-                timers: &self.timers,
             };
 
             self.root.event(&mut ctx, &event, data, env);
             ctx.is_handled
         };
 
         if let Some(focus_req) = base_state.request_focus.take() {
-            println!("root");
             let old = self.focus;
             let new = self.widget_for_focus_request(focus_req);
             let event = LifeCycle::Internal(InternalLifeCycle::RouteFocusChanged { old, new });