From 4640585fbdf72df993dbed46799844aa78996cce Mon Sep 17 00:00:00 2001 From: Martin Haug Date: Sat, 4 Jun 2022 12:57:45 +0200 Subject: First iteration of outline items --- src/library/layout/stack.rs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/library/layout/stack.rs') diff --git a/src/library/layout/stack.rs b/src/library/layout/stack.rs index 828ff8e3..7bad01d9 100644 --- a/src/library/layout/stack.rs +++ b/src/library/layout/stack.rs @@ -192,6 +192,9 @@ impl<'a> StackLayouter<'a> { self.dir.start().into() }); + let role_map = StyleMap::with_role(Role::GenericBlock); + let styles = role_map.chain(&styles); + let frames = node.layout(ctx, &self.regions, styles)?; let len = frames.len(); for (i, frame) in frames.into_iter().enumerate() { -- cgit v1.2.3 From 6d8b65c4b24206a1482ea143791d7a1c410a4313 Mon Sep 17 00:00:00 2001 From: Martin Haug Date: Wed, 8 Jun 2022 12:30:10 +0200 Subject: More consistent role application --- src/library/layout/stack.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/library/layout/stack.rs') diff --git a/src/library/layout/stack.rs b/src/library/layout/stack.rs index 7bad01d9..9c2cbccd 100644 --- a/src/library/layout/stack.rs +++ b/src/library/layout/stack.rs @@ -192,12 +192,14 @@ impl<'a> StackLayouter<'a> { self.dir.start().into() }); - let role_map = StyleMap::with_role(Role::GenericBlock); - let styles = role_map.chain(&styles); - let frames = node.layout(ctx, &self.regions, styles)?; let len = frames.len(); - for (i, frame) in frames.into_iter().enumerate() { + for (i, mut frame) in frames.into_iter().enumerate() { + // Set the generic block role. + if frame.role().map_or(true, Role::is_weak) { + Arc::make_mut(&mut frame).apply_role(Role::GenericBlock); + } + // Grow our size, shrink the region and save the frame for later. let size = frame.size.to_gen(self.axis); self.used.main += size.main; -- cgit v1.2.3