summaryrefslogtreecommitdiff
path: root/library/src/layout/flow.rs
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2023-03-10 20:47:23 +0100
committerLaurenz <laurmaedje@gmail.com>2023-03-10 21:19:50 +0100
commita9fdff244aef859449a76e5f762ee7c343a8ddcc (patch)
tree172b543183296b4bc30b3008650f594688467914 /library/src/layout/flow.rs
parent62f35602a87574dcc607f1637aeae1be574981ff (diff)
Expose content representation more
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 7a063bce..2671b983 100644
--- a/library/src/layout/flow.rs
+++ b/library/src/layout/flow.rs
@@ -32,7 +32,7 @@ impl Layout for FlowNode {
let outer = styles;
let mut styles = outer;
if let Some(node) = child.to::<StyledNode>() {
- map = node.map();
+ map = node.styles();
styles = outer.chain(&map);
child = node.body();
}
@@ -48,15 +48,15 @@ impl Layout for FlowNode {
|| child.is::<ImageNode>()
{
layouter.layout_single(vt, &child, styles)?;
- } else if child.has::<dyn Layout>() {
+ } else if child.can::<dyn Layout>() {
layouter.layout_multiple(vt, &child, styles)?;
} else if child.is::<ColbreakNode>() {
if !layouter.regions.backlog.is_empty() || layouter.regions.last.is_some()
{
layouter.finish_region();
}
- } else if let Some(span) = child.span() {
- bail!(span, "unexpected flow child");
+ } else {
+ bail!(child.span(), "unexpected flow child");
}
}
@@ -207,7 +207,7 @@ impl<'a> FlowLayouter<'a> {
let aligns = if let Some(align) = block.to::<AlignNode>() {
align.alignment(styles)
} else if let Some(styled) = block.to::<StyledNode>() {
- AlignNode::alignment_in(styles.chain(&styled.map()))
+ AlignNode::alignment_in(styles.chain(&styled.styles()))
} else {
AlignNode::alignment_in(styles)
}