mirror
/
typst
mirror of https://github.com/stelzo/typst.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow multiple subsequent spaces 📅

This commit is contained in:
Laurenz 2019-11-17 12:07:33 +01:00
parent 467d7203ee
commit 1f009b5b95
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/layout/flex.rs
View File

@ -139,6 +139,7 @@ impl FlexLayouter {
match unit {
FlexUnit::Boxed(boxed) => self.layout_box(boxed)?,
FlexUnit::Space(space) => {
self.layout_space();
self.space = Some(space);
}
@ -201,11 +202,7 @@ impl FlexLayouter {
self.finish_run()?;
}
if let Some(space) = self.space.take() {
if self.run.size.x > Size::zero() && self.run.size.x + space <= self.usable {
self.run.size.x += space;
}
}
self.layout_space();
self.run.content.push((self.run.size.x, boxed));
self.run.size.x += size.x;
@ -214,6 +211,14 @@ impl FlexLayouter {
Ok(())
}
fn layout_space(&mut self) {
if let Some(space) = self.space.take() {
if self.run.size.x > Size::zero() && self.run.size.x + space <= self.usable {
self.run.size.x += space;
}
}
}
fn layout_set_axes(&mut self, axes: LayoutAxes) {
// TODO
}