diff options
| author | Laurenz <laurmaedje@gmail.com> | 2021-06-11 11:30:18 +0200 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2021-06-11 11:30:18 +0200 |
| commit | 3330767c20e14a05176902a93dcefb08cb509173 (patch) | |
| tree | eb40b262d267df0e9f73bbbc4ec602183fd39dff /src/library/font.rs | |
| parent | c28708aa196eaca247cdab6b5e8af9751b4f1dad (diff) | |
Remove props in favor of using state for everything
Diffstat (limited to 'src/library/font.rs')
| -rw-r--r-- | src/library/font.rs | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/library/font.rs b/src/library/font.rs index a3fe6c13..c1ed1c98 100644 --- a/src/library/font.rs +++ b/src/library/font.rs @@ -64,54 +64,50 @@ pub fn font(ctx: &mut EvalContext, args: &mut FuncArgs) -> Value { Value::template("font", move |ctx| { let snapshot = ctx.state.clone(); + let font = ctx.state.font_mut(); if let Some(linear) = size { - if linear.rel.is_zero() { - ctx.state.font.size = linear.abs; - ctx.state.font.scale = Linear::one(); - } else { - ctx.state.font.scale = linear; - } + font.size = linear.resolve(font.size); } if !list.is_empty() { - ctx.state.font.families_mut().list = list.clone(); + font.families_mut().list = list.clone(); } if let Some(style) = style { - ctx.state.font.variant.style = style; + font.variant.style = style; } if let Some(weight) = weight { - ctx.state.font.variant.weight = weight; + font.variant.weight = weight; } if let Some(stretch) = stretch { - ctx.state.font.variant.stretch = stretch; + font.variant.stretch = stretch; } if let Some(top_edge) = top_edge { - ctx.state.font.top_edge = top_edge; + font.top_edge = top_edge; } if let Some(bottom_edge) = bottom_edge { - ctx.state.font.bottom_edge = bottom_edge; + font.bottom_edge = bottom_edge; } if let Some(color) = color { - ctx.state.font.fill = Fill::Color(color); + font.fill = Fill::Color(color); } if let Some(FontFamilies(serif)) = &serif { - ctx.state.font.families_mut().serif = serif.clone(); + font.families_mut().serif = serif.clone(); } if let Some(FontFamilies(sans_serif)) = &sans_serif { - ctx.state.font.families_mut().sans_serif = sans_serif.clone(); + font.families_mut().sans_serif = sans_serif.clone(); } if let Some(FontFamilies(monospace)) = &monospace { - ctx.state.font.families_mut().monospace = monospace.clone(); + font.families_mut().monospace = monospace.clone(); } if let Some(body) = &body { |