Changes as per linebender#831 (comment)

sjoshid · Apr 26, 2020 · 818d36d · 818d36d
1 parent f27be6f
commit 818d36d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/druid/src/contexts.rs b/druid/src/contexts.rs
@@ -24,7 +24,6 @@ use crate::{
     Affine, Command, Cursor, Insets, Point, Rect, Size, Target, Text, TimerToken, WidgetId,
     WindowHandle, WindowId,
 };
-use std::collections::HashMap;
 
 /// A mutable context provided to event handling methods of widgets.
 ///

diff --git a/druid/src/core.rs b/druid/src/core.rs
@@ -578,8 +578,8 @@ impl<T: Data, W: Widget<T>> WidgetPod<T, W> {
                 recurse = had_active || child_ctx.base_state.is_hot;
                 Event::Zoom(*zoom)
             }
-            Event::Timer(id) => {
-                panic!("We cannot be here");
+            Event::Timer(token) => {
+                Event::Timer(*token)
             }
             Event::Command(cmd) => Event::Command(cmd.clone()),
         };

diff --git a/druid/src/window.rs b/druid/src/window.rs
@@ -225,8 +225,8 @@ impl<T: Data> Window<T> {
 
         self.post_event_processing(queue, data, env, false);
 
-        if let Event::Timer(t) = event {
-            self.timers.remove(&t);
+        if let Event::Internal(InternalEvent::RouteTimer(token, _)) = event {
+            self.timers.remove(&token);
         }
 
         //If at least one widget requested timer, collect those timers from widgets and add to window's timers map.