Less vecs in layouting ⚡

1 files changed, 32 insertions, 19 deletions

diff --git a/src/layout/pad.rs b/src/layout/pad.rs
index 2994dd59..b26bea71 100644
--- a/src/layout/pad.rs
+++ b/src/layout/pad.rs
@@ -11,27 +11,16 @@ pub struct Pad {
 }
 
 impl Layout for Pad {
-    fn layout(&self, ctx: &mut LayoutContext, areas: &Areas) -> Vec<Layouted> {
-        let shrink = |size| size - self.padding.eval(size).size();
-        let areas = Areas {
-            current: Area {
-                rem: shrink(areas.current.rem),
-                full: shrink(areas.current.full),
-            },
-            backlog: areas.backlog.iter().copied().map(shrink).collect(),
-            last: areas.last.map(shrink),
-        };
+    fn layout(&self, ctx: &mut LayoutContext, areas: &Areas) -> Layouted {
+        let areas = shrink_areas(areas, self.padding);
 
         let mut layouted = self.child.layout(ctx, &areas);
-
-        for item in &mut layouted {
-            if let Layouted::Boxed(boxed, _) = item {
-                let padding = self.padding.eval(boxed.size);
-                let origin = Point::new(padding.left, padding.top);
-
-                boxed.size += padding.size();
-                for (point, _) in &mut boxed.elements {
-                    *point += origin;
+        match &mut layouted {
+            Layouted::Spacing(_) => {}
+            Layouted::Boxed(boxed, _) => pad_box(boxed, self.padding),
+            Layouted::Boxes(boxes) => {
+                for (boxed, _) in boxes {
+                    pad_box(boxed, self.padding);
                 }
             }
         }
@@ -40,6 +29,30 @@ impl Layout for Pad {
     }
 }
 
+/// Shrink all areas by the padding.
+fn shrink_areas(areas: &Areas, padding: Sides<Linear>) -> Areas {
+    let shrink = |size| size - padding.eval(size).size();
+    Areas {
+        current: Area {
+            rem: shrink(areas.current.rem),
+            full: shrink(areas.current.full),
+        },
+        backlog: areas.backlog.iter().copied().map(shrink).collect(),
+        last: areas.last.map(shrink),
+    }
+}
+
+/// Enlarge the box and move all elements inwards.
+fn pad_box(boxed: &mut BoxLayout, padding: Sides<Linear>) {
+    let padding = padding.eval(boxed.size);
+    let origin = Point::new(padding.left, padding.top);
+
+    boxed.size += padding.size();
+    for (point, _) in &mut boxed.elements {
+        *point += origin;
+    }
+}
+
 impl From<Pad> for LayoutNode {
     fn from(pad: Pad) -> Self {
         Self::dynamic(pad)