Remove base width

3 files changed, 11 insertions, 12 deletions

diff --git a/library/src/visualize/image.rs b/library/src/visualize/image.rs
index 87b67287..330f1d04 100644
--- a/library/src/visualize/image.rs
+++ b/library/src/visualize/image.rs
@@ -76,7 +76,7 @@ impl Layout for ImageNode {
         let px_ratio = pxw / pxh;
 
         // Find out whether the image is wider or taller than the target size.
-        let Regions { first, expand, .. } = regions;
+        let Regions { size: first, expand, .. } = regions;
         let region_ratio = first.x / first.y;
         let wide = px_ratio > region_ratio;
 
diff --git a/library/src/visualize/line.rs b/library/src/visualize/line.rs
index a8b0e334..28910a26 100644
--- a/library/src/visualize/line.rs
+++ b/library/src/visualize/line.rs
@@ -87,17 +87,17 @@ impl Layout for LineNode {
         let origin = self
             .start
             .resolve(styles)
-            .zip(regions.base)
+            .zip(regions.base())
             .map(|(l, b)| l.relative_to(b));
 
         let delta = self
             .delta
             .resolve(styles)
-            .zip(regions.base)
+            .zip(regions.base())
             .map(|(l, b)| l.relative_to(b));
 
         let size = origin.max(origin + delta).max(Size::zero());
-        let target = regions.expand.select(regions.first, size);
+        let target = regions.expand.select(regions.size, size);
 
         let mut frame = Frame::new(target);
         let shape = Geometry::Line(delta.to_point()).stroked(stroke);
diff --git a/library/src/visualize/shape.rs b/library/src/visualize/shape.rs
index c0c81bf5..6f70b6c1 100644
--- a/library/src/visualize/shape.rs
+++ b/library/src/visualize/shape.rs
@@ -555,41 +555,40 @@ fn layout(
 
         // Pad the child.
         let child = child.clone().padded(inset.map(|side| side.map(Length::from)));
-
-        let pod = Regions::one(regions.first, regions.base, regions.expand);
+        let pod = Regions::one(regions.size, regions.expand);
         frame = child.layout(vt, styles, pod)?.into_frame();
 
         // Relayout with full expansion into square region to make sure
         // the result is really a square or circle.
         if kind.is_quadratic() {
             let length = if regions.expand.x || regions.expand.y {
-                let target = regions.expand.select(regions.first, Size::zero());
+                let target = regions.expand.select(regions.size, Size::zero());
                 target.x.max(target.y)
             } else {
                 let size = frame.size();
                 let desired = size.x.max(size.y);
-                desired.min(regions.first.x).min(regions.first.y)
+                desired.min(regions.size.x).min(regions.size.y)
             };
 
             let size = Size::splat(length);
-            let pod = Regions::one(size, size, Axes::splat(true));
+            let pod = Regions::one(size, Axes::splat(true));
             frame = child.layout(vt, styles, pod)?.into_frame();
         }
     } else {
         // The default size that a shape takes on if it has no child and
         // enough space.
-        let mut size = Size::new(Abs::pt(45.0), Abs::pt(30.0)).min(regions.first);
+        let mut size = Size::new(Abs::pt(45.0), Abs::pt(30.0)).min(regions.size);
 
         if kind.is_quadratic() {
             let length = if regions.expand.x || regions.expand.y {
-                let target = regions.expand.select(regions.first, Size::zero());
+                let target = regions.expand.select(regions.size, Size::zero());
                 target.x.max(target.y)
             } else {
                 size.x.min(size.y)
             };
             size = Size::splat(length);
         } else {
-            size = regions.expand.select(regions.first, size);
+            size = regions.expand.select(regions.size, size);
         }
 
         frame = Frame::new(size);