From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 12 Jan 2021 17:59:01 +0000 (+0000)
Subject: ui: Move HELD_SURROUND_COLOUR into ui.rs
X-Git-Tag: otter-0.3.0~72
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=18f6c96a0b1853755f8c21274023af99ca461842;p=otter.git

ui: Move HELD_SURROUND_COLOUR into ui.rs

otterlib wants this, and we shouldn't specify it twice

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

diff --git a/daemon/session.rs b/daemon/session.rs
index 4da015fe..9b79961a 100644
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -49,6 +49,7 @@ struct SessionPieceLoadJson<'r> {
 struct DataLoad {
   last_log_ts: String,
   players: HashMap<PlayerId, DataLoadPlayer>,
+  held_surround_colour: &'static str,
 }
 
 #[derive(Deserialize)]
@@ -200,6 +201,7 @@ fn session_inner(form : Json<SessionForm>,
       load: serde_json::to_string(&DataLoad {
         players: load_players,
         last_log_ts: timestamp_abbrev.unwrap_or_default(),
+        held_surround_colour: HELD_SURROUND_COLOUR,
       }).map_err(|e| InternalError::JSONEncode(e))?,
     };
     trace!("SessionRenderContext {:?}", &src);
diff --git a/src/ui.rs b/src/ui.rs
index d4bc0edc..00ce792a 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -6,6 +6,8 @@ use crate::imports::*;
 
 pub const SVG_SCALE : f64 = 6.;
 
+pub const HELD_SURROUND_COLOUR: &str = "black";
+
 #[derive(Clone,Copy,Debug,Eq,PartialEq,Serialize,Deserialize,EnumString)]
 pub enum PresentationLayout {
   Portrait,
diff --git a/templates/script.ts b/templates/script.ts
index 637b9c42..1d62a377 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -91,6 +91,7 @@ interface DispatchTable<H> { [key: string]: H };
 // xxx any exceptions should have otter in them or something
 var globalinfo_elem : HTMLElement;
 var layout: Layout;
+var held_surround_colour: string;
 var general_timeout : number = 10000;
 var messages : DispatchTable<MessageHandler> = Object();
 var pieceops : DispatchTable<PieceHandler> = Object();
@@ -774,7 +775,7 @@ function redisplay_ancillaries(piece: PieceId, p: PieceInfo) {
   } 
   if (p.held != null) {
     let da = players[p.held!]!.dasharray;
-    let nelem = ancillary_node(piece, 'black');
+    let nelem = ancillary_node(piece, held_surround_colour);
     nelem.setAttributeNS(null,'stroke-dasharray',da);
     p.pelem.appendChild(nelem);
   }
@@ -1202,6 +1203,7 @@ function startup() {
   log_elem = document.getElementById("log")!;
   logscroll_elem = document.getElementById("logscroll") || log_elem;
   let dataload = JSON.parse(body.dataset.load!);
+  held_surround_colour = dataload.held_surround_colour!;
   players = dataload.players!;
   delete body.dataset.load;
   uos_node = document.getElementById("uos")!;