Implement overlay ordering for Image::float

core/src/overlay/element.rs

@@ -23,6 +23,18 @@ where
         Self { overlay }
     }
 
+    /// Returns a reference to the [`Overlay`] of the [`Element`],
+    pub fn as_overlay(&self) -> &dyn Overlay<Message, Theme, Renderer> {
+        self.overlay.as_ref()
+    }
+
+    /// Returns a mutable reference to the [`Overlay`] of the [`Element`],
+    pub fn as_overlay_mut(
+        &mut self,
+    ) -> &mut dyn Overlay<Message, Theme, Renderer> {
+        self.overlay.as_mut()
+    }
+
     /// Applies a transformation to the produced message of the [`Element`].
     pub fn map<B>(
         self,
@@ -38,82 +50,6 @@ where
             overlay: Box::new(Map::new(self.overlay, f)),
         }
     }
-
-    /// Computes the layout of the [`Element`] in the given bounds.
-    pub fn layout(
-        &mut self,
-        renderer: &Renderer,
-        bounds: Size,
-    ) -> layout::Node {
-        self.overlay.layout(renderer, bounds)
-    }
-
-    /// Processes a runtime [`Event`].
-    pub fn update(
-        &mut self,
-        event: &Event,
-        layout: Layout<'_>,
-        cursor: mouse::Cursor,
-        renderer: &Renderer,
-        clipboard: &mut dyn Clipboard,
-        shell: &mut Shell<'_, Message>,
-    ) {
-        self.overlay
-            .update(event, layout, cursor, renderer, clipboard, shell);
-    }
-
-    /// Returns the current [`mouse::Interaction`] of the [`Element`].
-    pub fn mouse_interaction(
-        &self,
-        layout: Layout<'_>,
-        cursor: mouse::Cursor,
-        viewport: &Rectangle,
-        renderer: &Renderer,
-    ) -> mouse::Interaction {
-        self.overlay
-            .mouse_interaction(layout, cursor, viewport, renderer)
-    }
-
-    /// Draws the [`Element`] and its children using the given [`Layout`].
-    pub fn draw(
-        &self,
-        renderer: &mut Renderer,
-        theme: &Theme,
-        style: &renderer::Style,
-        layout: Layout<'_>,
-        cursor: mouse::Cursor,
-    ) {
-        self.overlay.draw(renderer, theme, style, layout, cursor);
-    }
-
-    /// Applies a [`widget::Operation`] to the [`Element`].
-    pub fn operate(
-        &mut self,
-        layout: Layout<'_>,
-        renderer: &Renderer,
-        operation: &mut dyn widget::Operation,
-    ) {
-        self.overlay.operate(layout, renderer, operation);
-    }
-
-    /// Returns true if the cursor is over the [`Element`].
-    pub fn is_over(
-        &self,
-        layout: Layout<'_>,
-        renderer: &Renderer,
-        cursor_position: Point,
-    ) -> bool {
-        self.overlay.is_over(layout, renderer, cursor_position)
-    }
-
-    /// Returns the nested overlay of the [`Element`], if there is any.
-    pub fn overlay<'b>(
-        &'b mut self,
-        layout: Layout<'_>,
-        renderer: &Renderer,
-    ) -> Option<Element<'b, Message, Theme, Renderer>> {
-        self.overlay.overlay(layout, renderer)
-    }
 }
 
 struct Map<'a, A, B, Theme, Renderer> {