diff options
Diffstat (limited to 'src/library/place.rs')
| -rw-r--r-- | src/library/place.rs | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/library/place.rs b/src/library/place.rs index 9bcd3c37..34746d5b 100644 --- a/src/library/place.rs +++ b/src/library/place.rs @@ -26,11 +26,11 @@ impl Layout for PlaceNode { vm: &mut Vm, regions: &Regions, styles: StyleChain, - ) -> TypResult<Vec<Constrained<Arc<Frame>>>> { + ) -> TypResult<Vec<Arc<Frame>>> { let out_of_flow = self.out_of_flow(); // The pod is the base area of the region because for absolute - // placement we don't really care about the already used area (current). + // placement we don't really care about the already used area. let pod = { let finite = regions.base.map(Length::is_finite); let expand = finite & (regions.expand | out_of_flow); @@ -38,26 +38,20 @@ impl Layout for PlaceNode { }; let mut frames = self.0.layout(vm, &pod, styles)?; - let Constrained { item: frame, cts } = &mut frames[0]; // If expansion is off, zero all sizes so that we don't take up any // space in our parent. Otherwise, respect the expand settings. - let target = regions.expand.select(regions.current, Size::zero()); + let frame = &mut frames[0]; + let target = regions.expand.select(regions.first, Size::zero()); Arc::make_mut(frame).resize(target, Align::LEFT_TOP); - // Set base constraint because our pod size is base and exact - // constraints if we needed to expand or offset. - *cts = Constraints::new(regions.expand); - cts.base = regions.base.map(Some); - cts.exact = regions.current.filter(regions.expand | out_of_flow); - Ok(frames) } } impl PlaceNode { /// Whether this node wants to be placed relative to its its parent's base - /// origin. instead of relative to the parent's current flow/cursor + /// origin. Instead of relative to the parent's current flow/cursor /// position. pub fn out_of_flow(&self) -> bool { self.0 |