caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-13 20:46:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix flex primary expansion 🚧

Browse Source
This commit is contained in:
Laurenz 2019-11-21 16:14:26 +01:00
parent 863a1a7a00
commit 131e81baaf
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/layout/flex.rs
View File

@ -183,11 +183,14 @@ impl FlexLayouter {
fn finish_line(&mut self) -> LayoutResult<Size2D> { fn finish_line(&mut self) -> LayoutResult<Size2D> {
self.finish_partial_line(); self.finish_partial_line();
if self.axes.primary.needs_expansion() {
self.line.combined_dimensions.x = self.line.usable;
}
self.stack.add(Layout { self.stack.add(Layout {
dimensions: self.axes.specialize(Size2D { dimensions: self.axes.specialize(
x: self.line.usable, self.line.combined_dimensions+ Size2D::with_y(self.flex_spacing)
y: self.line.combined_dimensions.y + self.flex_spacing, ),
}),
actions: self.line.actions.to_vec(), actions: self.line.actions.to_vec(),
debug_render: false, debug_render: false,
})?; })?;
@ -221,8 +224,13 @@ impl FlexLayouter {
self.line.actions.add_layout(pos, layout); self.line.actions.add_layout(pos, layout);
} }
self.line.combined_dimensions.x = anchor + factor * self.part.dimensions.x; self.line.combined_dimensions.x = match self.axes.primary.alignment {
self.line.combined_dimensions.y.max_eq(self.part.dimensions.x); Alignment::Origin => self.part.dimensions.x,
Alignment::Center => self.part.usable / 2 + self.part.dimensions.x / 2,
Alignment::End => self.part.usable,
};
self.line.combined_dimensions.y.max_eq(self.part.dimensions.y);
} }
fn layout_box(&mut self, boxed: Layout) -> LayoutResult<()> { fn layout_box(&mut self, boxed: Layout) -> LayoutResult<()> {