diff options
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/layout.rs | 6 | ||||
| -rw-r--r-- | src/model/locate.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/model/layout.rs b/src/model/layout.rs index d8cf1cab..c971197a 100644 --- a/src/model/layout.rs +++ b/src/model/layout.rs @@ -366,7 +366,7 @@ impl Layout for SizedNode { // Ensure frame size matches regions size if expansion is on. let frame = &mut frames[0]; - let target = regions.expand.select(regions.first, frame.size); + let target = regions.expand.select(regions.first, frame.size()); Arc::make_mut(frame).resize(target, Align::LEFT_TOP); Ok(frames) @@ -391,7 +391,7 @@ impl Layout for FillNode { ) -> TypResult<Vec<Arc<Frame>>> { let mut frames = self.child.layout(ctx, regions, styles)?; for frame in &mut frames { - let shape = Geometry::Rect(frame.size).filled(self.fill); + let shape = Geometry::Rect(frame.size()).filled(self.fill); Arc::make_mut(frame).prepend(Point::zero(), Element::Shape(shape)); } Ok(frames) @@ -416,7 +416,7 @@ impl Layout for StrokeNode { ) -> TypResult<Vec<Arc<Frame>>> { let mut frames = self.child.layout(ctx, regions, styles)?; for frame in &mut frames { - let shape = Geometry::Rect(frame.size).stroked(self.stroke); + let shape = Geometry::Rect(frame.size()).stroked(self.stroke); Arc::make_mut(frame).prepend(Point::zero(), Element::Shape(shape)); } Ok(frames) diff --git a/src/model/locate.rs b/src/model/locate.rs index 495203aa..bda12ae9 100644 --- a/src/model/locate.rs +++ b/src/model/locate.rs @@ -299,7 +299,7 @@ fn locate_in_frame( frame: &Frame, ts: Transform, ) { - for &(pos, ref element) in &frame.elements { + for &(pos, ref element) in frame.elements() { match element { Element::Group(group) => { let ts = ts |