diff options
| author | Laurenz <laurmaedje@gmail.com> | 2022-04-07 10:50:39 +0200 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2022-04-07 11:07:00 +0200 |
| commit | 3d52387eea321e94c13b61666f7a758052b20c5d (patch) | |
| tree | 5c55c51ca7e4b53dee61d280c39b7f664b8b9d6b /src/library/layout | |
| parent | 20b4d590b3efbd9b7a44fd6d3a658e7b84d21b99 (diff) | |
Rework style chains
Diffstat (limited to 'src/library/layout')
| -rw-r--r-- | src/library/layout/flow.rs | 4 | ||||
| -rw-r--r-- | src/library/layout/page.rs | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/library/layout/flow.rs b/src/library/layout/flow.rs index 3602bea6..9f398277 100644 --- a/src/library/layout/flow.rs +++ b/src/library/layout/flow.rs @@ -37,12 +37,12 @@ impl Layout for FlowNode { let styles = map.chain(&styles); match child { FlowChild::Leading => { - let em = styles.get(TextNode::SIZE).abs; + let em = styles.get(TextNode::SIZE); let amount = styles.get(ParNode::LEADING).resolve(em); layouter.layout_spacing(amount.into()); } FlowChild::Parbreak => { - let em = styles.get(TextNode::SIZE).abs; + let em = styles.get(TextNode::SIZE); let leading = styles.get(ParNode::LEADING); let spacing = styles.get(ParNode::SPACING); let amount = (leading + spacing).resolve(em); diff --git a/src/library/layout/page.rs b/src/library/layout/page.rs index b1008feb..c8af4843 100644 --- a/src/library/layout/page.rs +++ b/src/library/layout/page.rs @@ -28,8 +28,10 @@ impl PageNode { /// How many columns the page has. pub const COLUMNS: NonZeroUsize = NonZeroUsize::new(1).unwrap(); /// The page's header. + #[property(referenced)] pub const HEADER: Marginal = Marginal::None; /// The page's footer. + #[property(referenced)] pub const FOOTER: Marginal = Marginal::None; fn construct(_: &mut Context, args: &mut Args) -> TypResult<Content> { @@ -116,8 +118,8 @@ impl PageNode { let regions = Regions::repeat(size, size, size.map(Length::is_finite)); let mut frames = child.layout(ctx, ®ions, styles)?; - let header = styles.get_ref(Self::HEADER); - let footer = styles.get_ref(Self::FOOTER); + let header = styles.get(Self::HEADER); + let footer = styles.get(Self::FOOTER); // Realize header and footer. for frame in &mut frames { |
