From 0655a20ad119e2e9790afcc45039fd4ac0e7d432 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 16 Mar 2023 20:23:25 +0100
Subject: Make `Shrink` have priority over `Fill` in layout

---
 widget/src/overlay/menu.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'widget/src/overlay/menu.rs')

diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index e45b44ae..ef39a952 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -254,15 +254,14 @@ where
         )
         .width(self.width);
 
-        let mut node = self.container.layout(self.state, renderer, &limits);
+        let node = self.container.layout(self.state, renderer, &limits);
+        let size = node.size();
 
         node.move_to(if space_below > space_above {
             position + Vector::new(0.0, self.target_height)
         } else {
-            position - Vector::new(0.0, node.size().height)
-        });
-
-        node
+            position - Vector::new(0.0, size.height)
+        })
     }
 
     fn on_event(
@@ -359,7 +358,6 @@ where
     ) -> layout::Node {
         use std::f32;
 
-        let limits = limits.width(Length::Fill).height(Length::Shrink);
         let text_size =
             self.text_size.unwrap_or_else(|| renderer.default_size());
 
@@ -372,7 +370,7 @@ where
                     * self.options.len() as f32,
             );
 
-            limits.resolve(intrinsic)
+            limits.resolve(intrinsic, Length::Fill, Length::Shrink)
         };
 
         layout::Node::new(size)
-- 
cgit 


From d278bfd21d0399009e652560afb9a4d185e92637 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 5 Jan 2024 17:46:33 +0100
Subject: Replace `width` and `height` with `Widget::size`

---
 widget/src/overlay/menu.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'widget/src/overlay/menu.rs')

diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index ef39a952..b9e06de8 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -342,12 +342,11 @@ where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
 {
-    fn width(&self) -> Length {
-        Length::Fill
-    }
-
-    fn height(&self) -> Length {
-        Length::Shrink
+    fn size(&self) -> Size<Length> {
+        Size {
+            width: Length::Fill,
+            height: Length::Shrink,
+        }
     }
 
     fn layout(
-- 
cgit 


From d62bb8193c1c43f565fcc5c52293d564c91e215d Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 9 Jan 2024 06:35:33 +0100
Subject: Introduce useful helpers in `layout` module

---
 widget/src/overlay/menu.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'widget/src/overlay/menu.rs')

diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index b9e06de8..f83eebea 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -369,7 +369,7 @@ where
                     * self.options.len() as f32,
             );
 
-            limits.resolve(intrinsic, Length::Fill, Length::Shrink)
+            limits.resolve(Length::Fill, Length::Shrink, intrinsic)
         };
 
         layout::Node::new(size)
-- 
cgit