From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 5 Jul 2021 19:50:15 +0000 (+0100)
Subject: ui: break out monospace_font
X-Git-Tag: otter-0.7.2~259
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=be964a21102443dd2a7af12c8f4dd637f59bbbf5;p=otter.git

ui: break out monospace_font

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/clock.rs b/src/clock.rs
index f9839b26..740ae2d2 100644
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -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),
diff --git a/src/ui.rs b/src/ui.rs
index 1cd7e68c..378aaa46 100644
--- 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,