From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 11 Jan 2021 00:54:52 +0000 (+0000)
Subject: break out SVG_SCALE (nfc)
X-Git-Tag: otter-0.3.0~85
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=203c885f2609cb2160e1fb391c3454726affeadd;p=otter.git

break out SVG_SCALE (nfc)

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

diff --git a/daemon/session.rs b/daemon/session.rs
index e1f98925..4da015fe 100644
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -19,6 +19,7 @@ struct SessionRenderContext {
   log: Vec<SessionFormattedLogEntry>,
   sse_url_prefix: String,
   links: Html,
+  scale: f64,
 }
 
 #[derive(Debug,Serialize)]
@@ -185,17 +186,18 @@ fn session_inner(form : Json<SessionForm>,
     let src = SessionRenderContext {
       table_colour: ig.gs.table_colour.clone(),
       ctoken,
-      gen : ig.gs.gen,
+      gen: ig.gs.gen,
       log,
-      table_size : ig.gs.table_size,
+      table_size: ig.gs.table_size,
       player,
-      defs : alldefs,
+      defs: alldefs,
       uses,
-      nick : gpl.nick.clone(),
+      scale: SVG_SCALE,
+      nick: gpl.nick.clone(),
       sse_url_prefix,
       ptoken: form.ptoken.clone(),
       links: (&*ig.links).into(),
-      load : serde_json::to_string(&DataLoad {
+      load: serde_json::to_string(&DataLoad {
         players: load_players,
         last_log_ts: timestamp_abbrev.unwrap_or_default(),
       }).map_err(|e| InternalError::JSONEncode(e))?,
diff --git a/src/ui.rs b/src/ui.rs
index 398839ca..d4bc0edc 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -4,6 +4,8 @@
 
 use crate::imports::*;
 
+pub const SVG_SCALE : f64 = 6.;
+
 #[derive(Clone,Copy,Debug,Eq,PartialEq,Serialize,Deserialize,EnumString)]
 pub enum PresentationLayout {
   Portrait,
diff --git a/templates/macros.tera b/templates/macros.tera
index 48dfa885..6679674f 100644
--- a/templates/macros.tera
+++ b/templates/macros.tera
@@ -53,7 +53,8 @@ Hi {{nick | escape}}
     <svg id="space"
 	 xmlns="http://www.w3.org/2000/svg"
 	 viewBox="0 0 {{ table_size[0] }} {{ table_size[1] }}"
-	 width="{{ table_size[0]*6 }}" height="{{ table_size[1]*6 }}"
+	 width="{{ table_size[0]*scale }}"
+	 height="{{ table_size[1]*scale }}"
 	 >
       <rect fill="{{ table_colour }}" x="0" y="0"
 	    width="{{ table_size[0] }}" height="{{ table_size[1] }}"/>