1 files changed, 16 insertions, 29 deletions

diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index 2590fe3b..65764148 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -1,9 +1,11 @@
 //! Decorate content and apply alignment.
 use std::hash::Hash;
 
+use crate::event::{self, Event};
+use crate::layout;
+use crate::overlay;
 use crate::{
-    layout, Align, Clipboard, Element, Event, Hasher, Layout, Length, Point,
-    Rectangle, Widget,
+    Align, Clipboard, Element, Hasher, Layout, Length, Point, Rectangle, Widget,
 };
 
 use std::u32;
@@ -29,8 +31,6 @@ where
     Renderer: self::Renderer,
 {
     /// Creates an empty [`Container`].
-    ///
-    /// [`Container`]: struct.Container.html
     pub fn new<T>(content: T) -> Self
     where
         T: Into<Element<'a, Message, Renderer>>,
@@ -49,80 +49,60 @@ where
     }
 
     /// Sets the padding of the [`Container`].
-    ///
-    /// [`Container`]: struct.Column.html
     pub fn padding(mut self, units: u16) -> Self {
         self.padding = units;
         self
     }
 
     /// Sets the width of the [`Container`].
-    ///
-    /// [`Container`]: struct.Container.html
     pub fn width(mut self, width: Length) -> Self {
         self.width = width;
         self
     }
 
     /// Sets the height of the [`Container`].
-    ///
-    /// [`Container`]: struct.Container.html
     pub fn height(mut self, height: Length) -> Self {
         self.height = height;
         self
     }
 
     /// Sets the maximum width of the [`Container`].
-    ///
-    /// [`Container`]: struct.Container.html
     pub fn max_width(mut self, max_width: u32) -> Self {
         self.max_width = max_width;
         self
     }
 
     /// Sets the maximum height of the [`Container`] in pixels.
-    ///
-    /// [`Container`]: struct.Container.html
     pub fn max_height(mut self, max_height: u32) -> Self {
         self.max_height = max_height;
         self
     }
 
     /// Sets the content alignment for the horizontal axis of the [`Container`].
-    ///
-    /// [`Container`]: struct.Container.html
     pub fn align_x(mut self, alignment: Align) -> Self {
         self.horizontal_alignment = alignment;
         self
     }
 
     /// Sets the content alignment for the vertical axis of the [`Container`].
-    ///
-    /// [`Container`]: struct.Container.html
     pub fn align_y(mut self, alignment: Align) -> Self {
         self.vertical_alignment = alignment;
         self
     }
 
     /// Centers the contents in the horizontal axis of the [`Container`].
-    ///
-    /// [`Container`]: struct.Container.html
     pub fn center_x(mut self) -> Self {
         self.horizontal_alignment = Align::Center;
         self
     }
 
     /// Centers the contents in the vertical axis of the [`Container`].
-    ///
-    /// [`Container`]: struct.Container.html
     pub fn center_y(mut self) -> Self {
         self.vertical_alignment = Align::Center;
         self
     }
 
     /// Sets the style of the [`Container`].
-    ///
-    /// [`Container`]: struct.Container.html
     pub fn style(mut self, style: impl Into<Renderer::Style>) -> Self {
         self.style = style.into();
         self
@@ -174,7 +154,7 @@ where
         messages: &mut Vec<Message>,
         renderer: &Renderer,
         clipboard: Option<&dyn Clipboard>,
-    ) {
+    ) -> event::Status {
         self.content.widget.on_event(
             event,
             layout.children().next().unwrap(),
@@ -191,11 +171,13 @@ where
         defaults: &Renderer::Defaults,
         layout: Layout<'_>,
         cursor_position: Point,
+        viewport: &Rectangle,
     ) -> Renderer::Output {
         renderer.draw(
             defaults,
             layout.bounds(),
             cursor_position,
+            viewport,
             &self.style,
             &self.content,
             layout.children().next().unwrap(),
@@ -214,6 +196,13 @@ where
 
         self.content.hash_layout(state);
     }
+
+    fn overlay(
+        &mut self,
+        layout: Layout<'_>,
+    ) -> Option<overlay::Element<'_, Message, Renderer>> {
+        self.content.overlay(layout.children().next().unwrap())
+    }
 }
 
 /// The renderer of a [`Container`].
@@ -221,20 +210,18 @@ where
 /// Your [renderer] will need to implement this trait before being
 /// able to use a [`Container`] in your user interface.
 ///
-/// [`Container`]: struct.Container.html
-/// [renderer]: ../../renderer/index.html
+/// [renderer]: crate::renderer
 pub trait Renderer: crate::Renderer {
     /// The style supported by this renderer.
     type Style: Default;
 
     /// Draws a [`Container`].
-    ///
-    /// [`Container`]: struct.Container.html
     fn draw<Message>(
         &mut self,
         defaults: &Self::Defaults,
         bounds: Rectangle,
         cursor_position: Point,
+        viewport: &Rectangle,
         style: &Self::Style,
         content: &Element<'_, Message, Self>,
         content_layout: Layout<'_>,