From 796c2486cee82f6e5aefc2d7d02f82a7eeb35a07 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Sat, 16 Nov 2019 14:03:27 +0100 Subject: =?UTF-8?q?Axes=20updating=20for=20stack=20layouter=20=F0=9F=93=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/tree.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/layout/tree.rs') diff --git a/src/layout/tree.rs b/src/layout/tree.rs index 2957420d..9cbcd641 100644 --- a/src/layout/tree.rs +++ b/src/layout/tree.rs @@ -94,9 +94,9 @@ impl<'a, 'p> TreeLayouter<'a, 'p> { Command::Add(layout) => self.flex.add(layout), Command::AddMultiple(layouts) => self.flex.add_multiple(layouts), - Command::FinishFlexRun => self.flex.add_break(), - Command::FinishFlexLayout => self.finish_paragraph()?, - Command::FinishLayout => self.finish_layout(true)?, + Command::BreakFlex => self.flex.add_break(), + Command::FinishFlex => self.finish_paragraph()?, + Command::BreakStack => self.finish_layout()?, Command::SetStyle(style) => *self.style.to_mut() = style, Command::SetAxes(axes) => { @@ -115,10 +115,10 @@ impl<'a, 'p> TreeLayouter<'a, 'p> { Ok(self.stack.finish()) } - /// Finish the current stack layout. - fn finish_layout(&mut self, include_empty: bool) -> LayoutResult<()> { + /// Finish the current stack layout with a hard break. + fn finish_layout(&mut self) -> LayoutResult<()> { self.finish_flex()?; - self.stack.finish_layout(include_empty); + self.stack.add_break(true); self.start_new_flex(); Ok(()) } -- cgit v1.2.3