summaryrefslogtreecommitdiff
path: root/library/src/layout/flow.rs
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2022-11-25 10:36:31 +0100
committerLaurenz <laurmaedje@gmail.com>2022-11-25 12:16:13 +0100
commitbf5edbbbbb75120d065d1c9587ccfa4eed4fdca1 (patch)
tree956af910ab27a8cec0db83171cd3f0b6d0570a60 /library/src/layout/flow.rs
parent96f72eee6c6b595164c7a0576c407d7a590661db (diff)
Tidy up
Diffstat (limited to 'library/src/layout/flow.rs')
-rw-r--r--library/src/layout/flow.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/library/src/layout/flow.rs b/library/src/layout/flow.rs
index 4508023a..3338da09 100644
--- a/library/src/layout/flow.rs
+++ b/library/src/layout/flow.rs
@@ -18,13 +18,13 @@ impl LayoutBlock for FlowNode {
fn layout_block(
&self,
world: Tracked<dyn World>,
- regions: &Regions,
styles: StyleChain,
+ regions: &Regions,
) -> SourceResult<Vec<Frame>> {
let mut layouter = FlowLayouter::new(regions);
for (child, map) in self.0.iter() {
- let styles = map.chain(&styles);
+ let styles = styles.chain(&map);
if let Some(&node) = child.to::<VNode>() {
layouter.layout_spacing(node.amount, styles);
} else if child.has::<dyn LayoutBlock>() {
@@ -136,7 +136,7 @@ impl FlowLayouter {
// aligned later.
if let Some(placed) = block.to::<PlaceNode>() {
if placed.out_of_flow() {
- let frame = block.layout_block(world, &self.regions, styles)?.remove(0);
+ let frame = block.layout_block(world, styles, &self.regions)?.remove(0);
self.items.push(FlowItem::Placed(frame));
return Ok(());
}
@@ -162,11 +162,11 @@ impl FlowLayouter {
if !self.last_block_was_par && is_par && !styles.get(ParNode::INDENT).is_zero() {
let property = Property::new(ParNode::INDENT, Length::zero());
reset = Style::Property(property);
- chained = reset.chain(&styles);
+ chained = styles.chain_one(&reset);
}
// Layout the block itself.
- let frames = block.layout_block(world, &self.regions, chained)?;
+ let frames = block.layout_block(world, chained, &self.regions)?;
let len = frames.len();
for (i, frame) in frames.into_iter().enumerate() {
// Grow our size, shrink the region and save the frame for later.