From e2f196f8ccce2106673721af9fc8b9d55a8e41c0 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 18 Apr 2022 01:02:15 +0100
Subject: [PATCH] ui: Break out HTML_TEXT_LABEL_ELEM_START from clock.rs

We actually need this in other places too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 src/clock.rs | 23 ++++++++++++-----------
 src/ui.rs    |  3 +++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/clock.rs b/src/clock.rs
index aa440026..886a13b0 100644
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -497,35 +497,36 @@ impl PieceTrait for Clock {
       let mins = mins.to_string();
       let mins_pad = Html::from_html_string("&nbsp;".repeat(3 - mins.len()));
 
-      let pointer = Html::lit(r##"
-  pointer-events="none"
-             "##);
       let font = monospace_font(6);
       hwrite!(f, r##"
-  <text x="1" y="{}" {} {} fill="{}" >{}{}{}</text>"##,
-             y, font, pointer, Html::lit(show.text),
+  <{} x="1" y="{}" {} fill="{}" >{}{}{}</text>"##,
+             HTML_TEXT_LABEL_ELEM_START,
+             y, font, Html::lit(show.text),
              mins_pad, HtmlStr::from_html_str(&mins), Html::lit(show.sigil)
       )?;
       hwrite!(f, r##"
-  <text x="14" y="{}" {} {} fill="{}" >{:02}</text>"##,
-             y, font, pointer, Html::lit(show.text),
+  <{} x="14" y="{}" {} fill="{}" >{:02}</text>"##,
+             HTML_TEXT_LABEL_ELEM_START,
+             y, font, Html::lit(show.text),
              secs
       )?;
       let nick_y = y - 0.5;
       if let Some(nick) = u.nick {
         hwrite!(f, r##"
-  <text x="21" y="{}" fill="{}" {} clip-path="url(#def.{}.cl)" 
+  <{} x="21" y="{}" fill="{}" clip-path="url(#def.{}.cl)" 
    font-size="4">{}</text>
               "##,
-               nick_y, show.text, pointer,
+               HTML_TEXT_LABEL_ELEM_START,
+               nick_y, show.text,
                vpid,
                nick,
         )?;
       } else {
         hwrite!(f, r##"
-  <text x="27" y="{}" fill="pink" stroke="red" {}
+  <{} x="27" y="{}" fill="pink" stroke="red"
    stroke-width="0.1" font-size="4">({})</text>"##,
-               nick_y, pointer, user,
+               HTML_TEXT_LABEL_ELEM_START,
+               nick_y, user,
         )?;
       }
     }
diff --git a/src/ui.rs b/src/ui.rs
index a668f61f..b5196fb6 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -23,6 +23,9 @@ pub const INVISIBLE_EDGE_SENSITIVE: f64 = 2.;
 
 pub const LABEL_FONT_SIZE: f64 = 4.0;
 
+pub const HTML_TEXT_LABEL_ELEM_START: HtmlLit =
+  Html::lit(r##"text pointer-events="none""##);
+
 /// Fudge factor
 ///
 /// When trying to centre text, we use text-align and/or text-anchor
-- 
2.30.2