modal fixed

Cargo.toml

@@ -46,7 +46,7 @@ default = [
     "color_picker",
     "floating_element",
     "grid",
-    #"modal",
+    "modal",
     #"tab_bar",
     #"tabs",
     #"time_picker",
@@ -90,8 +90,8 @@ members = [
     "examples/floating_element",
     "examples/floating_element_anchors",
     "examples/grid",
-    #"examples/modal",
-    #"examples/modal_component",
+    "examples/modal",
+    "examples/modal_component",
     #"examples/multiple_modals",
     #"examples/tab_bar",
     #"examples/tabs",

examples/modal/src/main.rs

@@ -151,7 +151,7 @@ impl Application for ModalExample {
                 modal(underlay, overlay)
                     .backdrop(Message::CloseModal)
                     .on_esc(Message::CloseModal)
-                    .align_y(alignment::Vertical::Top)
+                    .align_y(alignment::Vertical::Center)
                     .into()
             }
         }

src/native/modal.rs

@@ -155,8 +155,10 @@ where
         self.underlay.as_widget().height()
     }
 
-    fn layout(&self, renderer: &Renderer, limits: &Limits) -> Node {
-        self.underlay.as_widget().layout(renderer, limits)
+    fn layout(&self, tree: &mut Tree, renderer: &Renderer, limits: &Limits) -> Node {
+        self.underlay
+            .as_widget()
+            .layout(&mut tree.children[0], renderer, limits)
     }
 
     fn on_event(

src/native/overlay/modal.rs

@@ -68,9 +68,12 @@ where
     Renderer: core::Renderer,
     Renderer::Theme: StyleSheet,
 {
-    fn layout(&self, renderer: &Renderer, bounds: Size, _position: Point) -> layout::Node {
+    fn layout(&mut self, renderer: &Renderer, bounds: Size, _position: Point) -> layout::Node {
         let limits = layout::Limits::new(Size::ZERO, bounds);
-        let mut content = self.content.as_widget().layout(renderer, &limits);
+        let mut content = self
+            .content
+            .as_widget()
+            .layout(&mut self.state, renderer, &limits);
         let max_size = limits.max();
 
         content.align(