From ebbee6274cafa6865a0d9123b78cae305c3c12aa Mon Sep 17 00:00:00 2001 From: Laurenz Date: Sun, 12 Feb 2023 16:38:14 +0100 Subject: Fix square base --- library/src/layout/grid.rs | 2 +- library/src/visualize/shape.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'library/src') diff --git a/library/src/layout/grid.rs b/library/src/layout/grid.rs index d488430f..da8c4fca 100644 --- a/library/src/layout/grid.rs +++ b/library/src/layout/grid.rs @@ -321,7 +321,7 @@ impl<'a, 'v> GridLayouter<'a, 'v> { let rcols = vec![Abs::zero(); cols.len()]; let lrows = vec![]; - // We use the regions for auto row measurement. Since at that moment, + // We use these regions for auto row measurement. Since at that moment, // columns are already sized, we can enable horizontal expansion. let mut regions = regions.clone(); regions.expand = Axes::new(true, false); diff --git a/library/src/visualize/shape.rs b/library/src/visualize/shape.rs index e6cb55f5..c0c81bf5 100644 --- a/library/src/visualize/shape.rs +++ b/library/src/visualize/shape.rs @@ -556,7 +556,7 @@ fn layout( // Pad the child. let child = child.clone().padded(inset.map(|side| side.map(Length::from))); - let mut pod = Regions::one(regions.first, regions.base, regions.expand); + let pod = Regions::one(regions.first, regions.base, regions.expand); frame = child.layout(vt, styles, pod)?.into_frame(); // Relayout with full expansion into square region to make sure @@ -571,8 +571,8 @@ fn layout( desired.min(regions.first.x).min(regions.first.y) }; - pod.first = Size::splat(length); - pod.expand = Axes::splat(true); + let size = Size::splat(length); + let pod = Regions::one(size, size, Axes::splat(true)); frame = child.layout(vt, styles, pod)?.into_frame(); } } else { -- cgit v1.2.3