From 25006b9c6f2ae909d86871d3a13631d518c07158 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 21 Nov 2023 14:41:22 +0100
Subject: Fix `Overlay` composition

Translations were not easily composable.
---
 widget/src/lazy.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'widget/src/lazy.rs')

diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs
index 589dd938..167a055d 100644
--- a/widget/src/lazy.rs
+++ b/widget/src/lazy.rs
@@ -18,7 +18,7 @@ use crate::core::widget::tree::{self, Tree};
 use crate::core::widget::{self, Widget};
 use crate::core::Element;
 use crate::core::{
-    self, Clipboard, Hasher, Length, Point, Rectangle, Shell, Size,
+    self, Clipboard, Hasher, Length, Point, Rectangle, Shell, Size, Vector,
 };
 use crate::runtime::overlay::Nested;
 
@@ -333,9 +333,10 @@ where
         renderer: &Renderer,
         bounds: Size,
         position: Point,
+        translation: Vector,
     ) -> layout::Node {
         self.with_overlay_maybe(|overlay| {
-            overlay.layout(renderer, bounds, position)
+            overlay.layout(renderer, bounds, position, translation)
         })
         .unwrap_or_default()
     }
-- 
cgit 


From 22226394f7b1a0e0205b9bb5b3ef9b85a3b406f5 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 5 Jan 2024 17:24:43 +0100
Subject: Introduce `Widget::size_hint` and fix further layout inconsistencies

---
 widget/src/lazy.rs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'widget/src/lazy.rs')

diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs
index 167a055d..4f6513db 100644
--- a/widget/src/lazy.rs
+++ b/widget/src/lazy.rs
@@ -150,6 +150,13 @@ where
         self.with_element(|element| element.as_widget().height())
     }
 
+    fn size_hint(&self) -> Size<Length> {
+        Size {
+            width: Length::Shrink,
+            height: Length::Shrink,
+        }
+    }
+
     fn layout(
         &self,
         tree: &mut Tree,
-- 
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/lazy.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'widget/src/lazy.rs')

diff --git a/widget/src/lazy.rs b/widget/src/lazy.rs
index 4f6513db..e9edbb4c 100644
--- a/widget/src/lazy.rs
+++ b/widget/src/lazy.rs
@@ -142,12 +142,8 @@ where
         }
     }
 
-    fn width(&self) -> Length {
-        self.with_element(|element| element.as_widget().width())
-    }
-
-    fn height(&self) -> Length {
-        self.with_element(|element| element.as_widget().height())
+    fn size(&self) -> Size<Length> {
+        self.with_element(|element| element.as_widget().size())
     }
 
     fn size_hint(&self) -> Size<Length> {
-- 
cgit