From 0fc25d732d7cbc37cf801645849d1060f2cec4a3 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Sat, 3 Oct 2020 13:23:59 +0200 Subject: =?UTF-8?q?Port=20to=20kurbo=20=F0=9F=8E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/tree.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/layout/tree.rs') diff --git a/src/layout/tree.rs b/src/layout/tree.rs index b43ef089..58774215 100644 --- a/src/layout/tree.rs +++ b/src/layout/tree.rs @@ -202,16 +202,13 @@ impl<'a> TreeLayouter<'a> { // The line layouter has no idea of page styles and thus we // need to recompute the layouting space resulting of the // new page style and update it within the layouter. - let margins = style.margins(); - self.ctx.base = style.size.unpadded(margins); - self.layouter.set_spaces( - vec![LayoutSpace { - size: style.size, - padding: margins, - expansion: LayoutExpansion::new(true, true), - }], - true, - ); + let space = LayoutSpace { + size: style.size, + insets: style.insets(), + expansion: LayoutExpansion::new(true, true), + }; + self.ctx.base = space.usable(); + self.layouter.set_spaces(vec![space], true); } else { error!( @self.feedback, span, -- cgit v1.2.3