chiark / gitweb /
ui: break out monospace_font
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 5 Jul 2021 19:50:15 +0000 (20:50 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 6 Jul 2021 00:25:23 +0000 (01:25 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/clock.rs
src/ui.rs

index f9839b26b5f0cc202b93bccba4648c52ec61eae8..740ae2d292a303bd36af1ca8d23d2838375efb9f 100644 (file)
@@ -499,9 +499,7 @@ impl PieceTrait for Clock {
       let pointer = Html::lit(r##"
   pointer-events="none"
              "##);
-      let font = Html::lit(r##"
-  font-family="Latin Modern Mono, monospace" font-size="6" font-weight="700"
-             "##);
+      let font = monospace_font(6);
       hwrite!(f, r##"
   <text x="1" y="{}" {} {} fill="{}" >{}{}{}</text>"##,
              y, font, pointer, Html::lit(show.text),
index 1cd7e68cece54d6b7f27f38c12308ec7cd66b538..378aaa46dd062054b4c229d8d1819de5930e3122 100644 (file)
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -6,6 +6,13 @@ use crate::prelude::*;
 
 pub const HELD_SURROUND_COLOUR: &str = "black";
 
+const MONOSPACE: HtmlLit = Html::lit(
+  r#"font-family="Latin Modern Mono, monospace" font-weight="700""#);
+
+pub fn monospace_font(size: u32) -> Html {
+  hformat!(r##"{} font-size="{}""##, MONOSPACE, size)
+}
+
 #[derive(Clone,Copy,Debug,Eq,PartialEq,Serialize,Deserialize,EnumString)]
 pub enum PresentationLayout {
   Portrait,