Merge #88

DioxusLabs · Dec 27, 2021 · af671c3 · af671c3
2 parents e6a19dd + 7733026
commit af671c3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/algo.rs b/src/algo.rs
@@ -228,7 +228,7 @@ impl Forest {
                 min_size: child_style.min_size.resolve(node_inner_size),
                 max_size: child_style.max_size.resolve(node_inner_size),
 
-                position: child_style.position.map(|p| p.resolve(node_inner_size.width)),
+                position: child_style.position.zip_size(node_inner_size, |p, s| p.resolve(s)),
                 margin: child_style.margin.map(|m| m.resolve(node_inner_size.width).or_else(0.0)),
                 padding: child_style.padding.map(|p| p.resolve(node_inner_size.width).or_else(0.0)),
                 border: child_style.border.map(|b| b.resolve(node_inner_size.width).or_else(0.0)),

diff --git a/src/geometry.rs b/src/geometry.rs
@@ -22,6 +22,18 @@ impl<T> Rect<T> {
     {
         Rect { start: f(self.start), end: f(self.end), top: f(self.top), bottom: f(self.bottom) }
     }
+    pub(crate) fn zip_size<R, F, U>(self, size: Size<U>, f: F) -> Rect<R>
+    where
+        F: Fn(T, U) -> R,
+        U: Copy,
+    {
+        Rect {
+            start: f(self.start, size.width),
+            end: f(self.end, size.width),
+            top: f(self.top, size.height),
+            bottom: f(self.bottom, size.height),
+        }
+    }
 }
 
 impl<T> Rect<T>