wip rebase updates

src/widget/rectangle_tracker/mod.rs

@@ -204,7 +204,7 @@ where
     }
 
     fn layout(
-        &self,
+        &mut self,
         tree: &mut Tree,
         renderer: &Renderer,
         limits: &layout::Limits,
@@ -221,7 +221,7 @@ where
     }
 
     fn operate(
-        &self,
+        &mut self,
         tree: &mut Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
@@ -230,18 +230,18 @@ where
         self.container.operate(tree, layout, renderer, operation);
     }
 
-    fn on_event(
+    fn update(
         &mut self,
         tree: &mut Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor_position: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
         viewport: &iced_core::Rectangle,
-    ) -> event::Status {
-        self.container.on_event(
+    ) {
+        self.container.update(
             tree,
             event,
             layout,
@@ -290,11 +290,13 @@ where
     fn overlay<'b>(
         &'b mut self,
         tree: &'b mut Tree,
-        layout: Layout<'_>,
+        layout: Layout<'b>,
         renderer: &Renderer,
+        viewport: &Rectangle,
         translation: Vector,
     ) -> Option<overlay::Element<'b, Message, crate::Theme, Renderer>> {
-        self.container.overlay(tree, layout, renderer, translation)
+        self.container
+            .overlay(tree, layout, renderer, viewport, translation)
     }
 
     fn drag_destinations(

src/widget/rectangle_tracker/subscription.rs

@@ -18,10 +18,10 @@ pub fn rectangle_tracker_subscription<
 >(
     id: I,
 ) -> Subscription<(I, RectangleUpdate<R>)> {
-    Subscription::run_with_id(
-        id,
-        stream::unfold(State::Ready, move |state| start_listening(id, state)),
-    )
+    Subscription::run_with(id, |id| {
+        let id = *id;
+        stream::unfold(State::Ready, move |state| start_listening(id, state))
+    })
 }
 
 pub enum State<I> {