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.
---
 runtime/src/overlay/nested.rs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'runtime/src/overlay/nested.rs')

diff --git a/runtime/src/overlay/nested.rs b/runtime/src/overlay/nested.rs
index 062ccc72..b7cfc918 100644
--- a/runtime/src/overlay/nested.rs
+++ b/runtime/src/overlay/nested.rs
@@ -4,7 +4,9 @@ use crate::core::mouse;
 use crate::core::overlay;
 use crate::core::renderer;
 use crate::core::widget;
-use crate::core::{Clipboard, Event, Layout, Point, Rectangle, Shell, Size};
+use crate::core::{
+    Clipboard, Event, Layout, Point, Rectangle, Shell, Size, Vector,
+};
 
 /// An overlay container that displays nested overlays
 #[allow(missing_debug_implementations)]
@@ -34,18 +36,18 @@ where
         renderer: &Renderer,
         bounds: Size,
         position: Point,
+        translation: Vector,
     ) -> layout::Node {
         fn recurse<Message, Renderer>(
             element: &mut overlay::Element<'_, Message, Renderer>,
             renderer: &Renderer,
             bounds: Size,
             position: Point,
+            translation: Vector,
         ) -> layout::Node
         where
             Renderer: renderer::Renderer,
         {
-            let translation = position - Point::ORIGIN;
-
             let node = element.layout(renderer, bounds, translation);
 
             if let Some(mut nested) =
@@ -55,7 +57,13 @@ where
                     node.size(),
                     vec![
                         node,
-                        recurse(&mut nested, renderer, bounds, position),
+                        recurse(
+                            &mut nested,
+                            renderer,
+                            bounds,
+                            position,
+                            translation,
+                        ),
                     ],
                 )
             } else {
@@ -63,7 +71,7 @@ where
             }
         }
 
-        recurse(&mut self.overlay, renderer, bounds, position)
+        recurse(&mut self.overlay, renderer, bounds, position, translation)
     }
 
     /// Draws the [`Nested`] overlay using the associated `Renderer`.
-- 
cgit 


From a1439071d691be8096ce956df90d1553fe5b3694 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 21 Nov 2023 18:53:31 +0100
Subject: Remove unused `position` argument in `overlay::Nested`

---
 runtime/src/overlay/nested.rs | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'runtime/src/overlay/nested.rs')

diff --git a/runtime/src/overlay/nested.rs b/runtime/src/overlay/nested.rs
index b7cfc918..4256efb7 100644
--- a/runtime/src/overlay/nested.rs
+++ b/runtime/src/overlay/nested.rs
@@ -35,14 +35,13 @@ where
         &mut self,
         renderer: &Renderer,
         bounds: Size,
-        position: Point,
+        _position: Point,
         translation: Vector,
     ) -> layout::Node {
         fn recurse<Message, Renderer>(
             element: &mut overlay::Element<'_, Message, Renderer>,
             renderer: &Renderer,
             bounds: Size,
-            position: Point,
             translation: Vector,
         ) -> layout::Node
         where
@@ -57,13 +56,7 @@ where
                     node.size(),
                     vec![
                         node,
-                        recurse(
-                            &mut nested,
-                            renderer,
-                            bounds,
-                            position,
-                            translation,
-                        ),
+                        recurse(&mut nested, renderer, bounds, translation),
                     ],
                 )
             } else {
@@ -71,7 +64,7 @@ where
             }
         }
 
-        recurse(&mut self.overlay, renderer, bounds, position, translation)
+        recurse(&mut self.overlay, renderer, bounds, translation)
     }
 
     /// Draws the [`Nested`] overlay using the associated `Renderer`.
-- 
cgit