diff options
Diffstat (limited to 'src/library/layout')
| -rw-r--r-- | src/library/layout/align.rs | 2 | ||||
| -rw-r--r-- | src/library/layout/columns.rs | 4 | ||||
| -rw-r--r-- | src/library/layout/flow.rs | 6 | ||||
| -rw-r--r-- | src/library/layout/grid.rs | 12 | ||||
| -rw-r--r-- | src/library/layout/pad.rs | 4 | ||||
| -rw-r--r-- | src/library/layout/page.rs | 2 | ||||
| -rw-r--r-- | src/library/layout/stack.rs | 4 |
7 files changed, 17 insertions, 17 deletions
diff --git a/src/library/layout/align.rs b/src/library/layout/align.rs index c0a7d16c..c5adcf9f 100644 --- a/src/library/layout/align.rs +++ b/src/library/layout/align.rs @@ -47,7 +47,7 @@ impl Layout for AlignNode { for (region, frame) in regions.iter().zip(&mut frames) { // Align in the target size. The target size depends on whether we // should expand. - let target = regions.expand.select(region, frame.size); + let target = regions.expand.select(region, frame.size()); let aligns = self .aligns .map(|align| align.resolve(styles)) diff --git a/src/library/layout/columns.rs b/src/library/layout/columns.rs index 4c842261..b9e308f2 100644 --- a/src/library/layout/columns.rs +++ b/src/library/layout/columns.rs @@ -80,10 +80,10 @@ impl Layout for ColumnsNode { }; if !regions.expand.y { - output.size.y.set_max(frame.size.y); + output.size_mut().y.set_max(frame.height()); } - let width = frame.size.x; + let width = frame.width(); let x = if dir.is_positive() { cursor } else { diff --git a/src/library/layout/flow.rs b/src/library/layout/flow.rs index f779c8b1..b6844f55 100644 --- a/src/library/layout/flow.rs +++ b/src/library/layout/flow.rs @@ -189,7 +189,7 @@ impl FlowLayouter { } // Grow our size, shrink the region and save the frame for later. - let size = frame.size; + let size = frame.size(); self.used.y += size.y; self.used.x.set_max(size.x); self.regions.first.y -= size.y; @@ -231,10 +231,10 @@ impl FlowLayouter { } FlowItem::Frame(frame, aligns) => { ruler = ruler.max(aligns.y); - let x = aligns.x.position(size.x - frame.size.x); + let x = aligns.x.position(size.x - frame.width()); let y = offset + ruler.position(size.y - self.used.y); let pos = Point::new(x, y); - offset += frame.size.y; + offset += frame.height(); output.push_frame(pos, frame); } FlowItem::Placed(frame) => { diff --git a/src/library/layout/grid.rs b/src/library/layout/grid.rs index 2d6eb259..c04913a1 100644 --- a/src/library/layout/grid.rs +++ b/src/library/layout/grid.rs @@ -304,7 +304,7 @@ impl<'a> GridLayouter<'a> { } let frame = node.layout(self.ctx, &pod, self.styles)?.remove(0); - resolved.set_max(frame.size.x); + resolved.set_max(frame.width()); } } @@ -376,7 +376,7 @@ impl<'a> GridLayouter<'a> { let mut sizes = node .layout(self.ctx, &pod, self.styles)? .into_iter() - .map(|frame| frame.size.y); + .map(|frame| frame.height()); self.ctx.pins.unfreeze(); // For each region, we want to know the maximum height any @@ -432,7 +432,7 @@ impl<'a> GridLayouter<'a> { let frame = self.layout_single_row(resolved, y)?; // Skip to fitting region. - let height = frame.size.y; + let height = frame.height(); while !self.regions.first.y.fits(height) && !self.regions.in_last() { self.finish_region()?; @@ -533,8 +533,8 @@ impl<'a> GridLayouter<'a> { /// Push a row frame into the current region. fn push_row(&mut self, frame: Frame) { - self.regions.first.y -= frame.size.y; - self.used.y += frame.size.y; + self.regions.first.y -= frame.height(); + self.used.y += frame.height(); self.lrows.push(Row::Frame(frame)); } @@ -562,7 +562,7 @@ impl<'a> GridLayouter<'a> { } }; - let height = frame.size.y; + let height = frame.height(); output.push_frame(pos, frame); pos.y += height; } diff --git a/src/library/layout/pad.rs b/src/library/layout/pad.rs index 97b760e1..29a72588 100644 --- a/src/library/layout/pad.rs +++ b/src/library/layout/pad.rs @@ -40,13 +40,13 @@ impl Layout for PadNode { for frame in &mut frames { // Apply the padding inversely such that the grown size padded // yields the frame's size. - let padded = grow(frame.size, padding); + let padded = grow(frame.size(), padding); let padding = padding.relative_to(padded); let offset = Point::new(padding.left, padding.top); // Grow the frame and translate everything in the frame inwards. let frame = Arc::make_mut(frame); - frame.size = padded; + frame.set_size(padded); frame.translate(offset); } diff --git a/src/library/layout/page.rs b/src/library/layout/page.rs index c2fbaba0..e22bb4f7 100644 --- a/src/library/layout/page.rs +++ b/src/library/layout/page.rs @@ -106,7 +106,7 @@ impl PageNode { // Realize overlays. for frame in &mut frames { - let size = frame.size; + let size = frame.size(); let pad = padding.resolve(styles).relative_to(size); let pw = size.x - pad.left - pad.right; let py = size.y - pad.bottom; diff --git a/src/library/layout/stack.rs b/src/library/layout/stack.rs index 9c2cbccd..5d3e1786 100644 --- a/src/library/layout/stack.rs +++ b/src/library/layout/stack.rs @@ -201,7 +201,7 @@ impl<'a> StackLayouter<'a> { } // Grow our size, shrink the region and save the frame for later. - let size = frame.size.to_gen(self.axis); + let size = frame.size().to_gen(self.axis); self.used.main += size.main; self.used.cross.set_max(size.cross); *self.regions.first.get_mut(self.axis) -= size.main; @@ -248,7 +248,7 @@ impl<'a> StackLayouter<'a> { // Align along the block axis. let parent = size.get(self.axis); - let child = frame.size.get(self.axis); + let child = frame.size().get(self.axis); let block = ruler.position(parent - self.used.main) + if self.dir.is_positive() { cursor |