From 1c80fd20e77604bb46df8b34880effbffac90649 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 23 Aug 2020 23:19:46 +0100
Subject: [PATCH] table size propagates

---
 demo/test.game.toml    |   2 +-
 save/g-dummy           | Bin 771 -> 1661 bytes
 src/gamestate.rs       |   2 +-
 src/session.rs         |   2 ++
 templates/session.tera |   6 ++++--
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/demo/test.game.toml b/demo/test.game.toml
index 6c19b27c..770d55b4 100644
--- a/demo/test.game.toml
+++ b/demo/test.game.toml
@@ -1,4 +1,4 @@
-# table_size = [300, 200]
+table_size = [300, 100]
 
 [[pieces]]
 pos = [90,80]
diff --git a/save/g-dummy b/save/g-dummy
index 706272524b9c3f7bf5727edd4f9e5b3a9e82ba85..bcaebbd727680fc8b7536d3b2e28f3335bc77094 100644
GIT binary patch
literal 1661
zcmcgsL2uJA6mA3pHUtt95;rhh0Es~pZJ<gVkT_35>P}oD$9YXG+$7j(wdK~KO`O9o
z7)e{HLvZ54IP6XX=Sln+oVr_=uA7nzk^K&S-)Fz?^K*7bA+{Kpf<_Q$+7o*aP#_>a
zZTGvFb>MK=1um%X)usy{lfW18+n0MmZ@)>~0fVNC1K3Gz5M&_UcQA)Ez@dAvj#l*g
zWV*<xqi!Btv?61)F9>E}n<qG3;&hocj2vf7a0ZG-I0(4EY1$Ou9ulAV9WLV3l69pH
zhpn`Q3Di;-n0+{i7<7Sc??t~}J*`c?&yka9ONj$srY(;c79n92yztAa(O7Lfe_=G%
zUhCgw+O(kMb1-L++Oh0gMcHo_%O;c)req&ITSs*yh2uQPA%mRK2q}DiZQhG1S<iub
zK4xU&%$l@mu|Ww3`@i`!3>e;$Epl$d^iq$KcYVw#fn!&-sjDiNSiW_VnO;}IeCKcN
zPJF4Cx?!6gJ=|~s$?K+!hB)*&dc@%|@x2yxI#MnQW!k}Qh_6;9ELA03uS&R4m2guL
z4kn%<hhq^)i5TULkJJ;3?<&ksh2g*ei!-2mB{sTWwYmo-Hf@%vZbN~7%*)L0Q@yBo
z{Go8zDVe81I|@|3NyfW{Z5KN{{;EJ1TRi@zP#3EBT{!L>6@Ln##WiKx<uXNO+7$&W
VZ%L+It4>+2Na?rnraAjT{{zS&eqR6p

delta 104
zcmey%)6B--wyGpCDJM0)II}8s(wP$z1vDn>GaePR|G)qSi>lJu7N@7?u}^$y&d4}X
fYZVTe$&O4RZ0w73^3x|xp3jstIggE<17-#QaiSp^

diff --git a/src/gamestate.rs b/src/gamestate.rs
index 697a328e..ba5cbb26 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -22,7 +22,7 @@ visible_slotmap_key!{ VisiblePieceId('.') }
 #[serde(try_from="f64")]
 pub struct ZCoord(pub f64);
 
-pub const DEFAULT_TABLE_SIZE : Pos = [ 200, 100 ];
+pub const DEFAULT_TABLE_SIZE : Pos = [ 400, 200 ];
 
 // ---------- general data types ----------
 
diff --git a/src/session.rs b/src/session.rs
index c512e931..fdaaa615 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -7,6 +7,7 @@ struct SessionRenderContext {
   ctoken : String,
   player : PlayerId,
   gen : Generation,
+  table_size : Pos,
   uses : Vec<SessionPieceContext>,
   defs : Vec<(VisiblePieceId,String)>,
   nick : String,
@@ -113,6 +114,7 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
       ctoken : ctoken.0,
       gen : ig.gs.gen,
       log : ig.gs.log.clone(),
+      table_size : ig.gs.table_size,
       player,
       defs : alldefs,
       uses,
diff --git a/templates/session.tera b/templates/session.tera
index 69eba9f3..19e5e5e7 100644
--- a/templates/session.tera
+++ b/templates/session.tera
@@ -11,10 +11,12 @@
 
 <p>
     <svg id="space"
-	 xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 110"
+	 xmlns="http://www.w3.org/2000/svg"
+	 viewBox="0 0 {{ table_size[0] }} {{ table_size[1] }}"
  	 onmousedown="some_mousedown(event)"
 	 >
-      <rect fill="green" x="20" y="5" width="200" height="100"/>
+      <rect fill="green" x="0" y="0"
+	    width="{{ table_size[0] }}" height="{{ table_size[1] }}"/>
       <g id="pieces_marker"></g>
 {%- for piece in uses %}
       <use id="use{{ piece.id }}" href="#piece{{ piece.id }}"
-- 
2.30.2