Refactor a bit

1 files changed, 7 insertions, 6 deletions

diff --git a/src/layout/pad.rs b/src/layout/pad.rs
index d1b575a9..dfe6dc47 100644
--- a/src/layout/pad.rs
+++ b/src/layout/pad.rs
@@ -16,6 +16,7 @@ impl Layout for PadNode {
         ctx: &mut LayoutContext,
         regions: &Regions,
     ) -> Vec<Constrained<Rc<Frame>>> {
+        // Layout child into padded regions.
         let mut frames = self.child.layout(
             ctx,
             &regions.map(|size| size - self.padding.resolve(size).size()),
@@ -38,6 +39,12 @@ impl Layout for PadNode {
             let padding = self.padding.resolve(padded);
             let origin = Point::new(padding.left, padding.top);
 
+            // Create a new larger frame and place the child's frame inside it.
+            let empty = Frame::new(padded, frame.baseline + origin.y);
+            let prev = std::mem::replace(frame, Rc::new(empty));
+            let new = Rc::make_mut(frame);
+            new.push_frame(origin, prev);
+
             // Inflate min and max contraints by the padding.
             for spec in [&mut constraints.min, &mut constraints.max] {
                 if let Some(x) = spec.x.as_mut() {
@@ -62,12 +69,6 @@ impl Layout for PadNode {
             if self.padding.top.is_relative() || self.padding.bottom.is_relative() {
                 constraints.base.y = Some(base.h);
             }
-
-            // Create a new larger frame and place the child's frame inside it.
-            let empty = Frame::new(padded, frame.baseline + origin.y);
-            let prev = std::mem::replace(frame, Rc::new(empty));
-            let new = Rc::make_mut(frame);
-            new.push_frame(origin, prev);
         }
 
         frames