From a33973eeb6c9dc58cd3bfb073cdb9bebcbaf9148 Mon Sep 17 00:00:00 2001
From: raphael <raphael@cloud13.de>
Date: Fri, 22 May 2020 15:45:11 +0200
Subject: [PATCH] add option to change the background image grid

---
 assets/images/bg_dots.png                 | Bin 0 -> 673 bytes
 assets/images/{KtEBa2.png => bg_grid.png} | Bin
 config.default.yml                        |   3 +++
 scripts/config/config-schema.json         |   3 +++
 src/js/main.js                            |   1 +
 src/js/services/ConfigService.js          |  10 ++++++++++
 src/js/whiteboard.js                      |   3 +--
 7 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 assets/images/bg_dots.png
 rename assets/images/{KtEBa2.png => bg_grid.png} (100%)

diff --git a/assets/images/bg_dots.png b/assets/images/bg_dots.png
new file mode 100644
index 0000000000000000000000000000000000000000..6de96466182629bc1d7e92de4c301498ec53eadd
GIT binary patch
literal 673
zcmV;S0$%-zP)<h;3K|Lk000e1NJLTq001Tc001Wl1^@s6V_`ZA0004TX+uL$X=7sm
z04R}lkv&VpP!xvWwn{}S6%-V4$WX<hg`!X#wGLg1lv=^6OLCjELXw7?6e+HPi$lRd
zbn$EOALuH$DhPrih&cEQ{92^MbDKhov?tu0hxeZMaPPT*Kdm#v?ui42>F{hSDXr$$
zq~JRO7{w5LNXX2#7BZPMy2j5V)lodeM6d339b=%N+6?gZ5hs|%9pZW7^p;}@-Xk7i
zCAmO+LLB9EK;m1WD;~cIE_(bWnCG&KfM4{Kifyd4F)ML{c$zq3=oQvHkGM%lHCL7?
zkJFlfjVw|~LV|({Hlf2ojIv2H>+Fj+d`l>khtc0c6`UMJl*k(;wL)E0${Oh^eLAXQ
z?*Hd$YqK+6_fQh(eRbW>Ng%in)N8K$d+NINGa&E+T$?R_ndUV2O?s`RMUH{+4sdzX
z(v$<>Y8M!Lwq!0hqyR0yrU4%pz+fI2z6bi(y;(K)asCA4w&{uPfWsqTit57~f7;e(
z`4J%+SpWb432;bRa{vGi!~g&e!~vBn4jTXf0M<!FK~z`??UrE*gD?z*8&9^~L{GNe
z#A_)Vbd3;s_(PH|3}LT-675TTe60{Ew^B=6b>4!eT}$q=*Jbn)HTG>IbEM|ddeye9
z@s;9mB{S%S#*l_5CovBt)Q}j`@Z==sp@bR|LmHl(#5|NxLt;q7lMgs~dJ4`o({no8
z4({n_ty3(l<+Z?*FC8D_CbZbo!@i_`%F&c<_Czz)Q+uoteGz2*6M5=ixxUvl)Biy%
z4OeTFdXzMlNg&#bM@eE)0#QBh7>Pv*MD@I5VPcsxe`c=_T*E$l#F@$_00000NkvXX
Hu0mjf{(>x3

literal 0
HcmV?d00001

diff --git a/assets/images/KtEBa2.png b/assets/images/bg_grid.png
similarity index 100%
rename from assets/images/KtEBa2.png
rename to assets/images/bg_grid.png
diff --git a/config.default.yml b/config.default.yml
index ea8ef46..da713fe 100644
--- a/config.default.yml
+++ b/config.default.yml
@@ -31,6 +31,9 @@ frontend:
   # draw the background grid to images on download ? (If True, even PNGs are also not transparent anymore) -- boolean
   drawBackgroundGrid: false
 
+  # Background Image; Can be "bg_grid.png" or "bg_dots.png"  -- string
+  backgroundGridImage: "bg_grid.png"
+
   # Frontend performance tweaks
   performance:
     # Refresh frequency of the debug / info div (in Hz i.e. /s) -- number
diff --git a/scripts/config/config-schema.json b/scripts/config/config-schema.json
index e42fca3..4f04b49 100644
--- a/scripts/config/config-schema.json
+++ b/scripts/config/config-schema.json
@@ -54,6 +54,9 @@
         "drawBackgroundGrid": {
           "type": "boolean"
         },
+        "backgroundGridImage": {
+          "type": "string"
+        },
         "performance": {
           "type": "object",
           "additionalProperties": false,
diff --git a/src/js/main.js b/src/js/main.js
index f8c280f..36a4852 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -140,6 +140,7 @@ function initWhiteboard() {
             //Load the whiteboard
             whiteboardId: whiteboardId,
             username: btoa(myUsername),
+            backgroundGridUrl: "./images/" + ConfigService.backgroundGridImage,
             sendFunction: function (content) {
                 if (ReadOnlyService.readOnlyActive) return;
                 //ADD IN LATER THROUGH CONFIG
diff --git a/src/js/services/ConfigService.js b/src/js/services/ConfigService.js
index cc34026..7c4911e 100644
--- a/src/js/services/ConfigService.js
+++ b/src/js/services/ConfigService.js
@@ -48,6 +48,14 @@ class ConfigService {
         return this.#drawBackgroundGrid;
     }
 
+    /**
+     * @type {string}
+     */
+    #backgroundGridImage = "bg_grid.png";
+    get backgroundGridImage() {
+        return this.#backgroundGridImage;
+    }
+
     /**
      * @type {{minDistDelta: number, minTimeDelta: number}}
      */
@@ -78,6 +86,7 @@ class ConfigService {
             showSmallestScreenIndicator,
             imageDownloadFormat,
             drawBackgroundGrid,
+            backgroundGridImage,
             performance,
         } = common;
 
@@ -85,6 +94,7 @@ class ConfigService {
         this.#showSmallestScreenIndicator = showSmallestScreenIndicator;
         this.#imageDownloadFormat = imageDownloadFormat;
         this.#drawBackgroundGrid = drawBackgroundGrid;
+        this.#backgroundGridImage = backgroundGridImage;
         this.#refreshInfoInterval = 1000 / performance.refreshInfoFreq;
 
         console.log("Whiteboard config from server:", configFromServer, "parsed:", this);
diff --git a/src/js/whiteboard.js b/src/js/whiteboard.js
index e990726..01f0a07 100644
--- a/src/js/whiteboard.js
+++ b/src/js/whiteboard.js
@@ -4,7 +4,6 @@ import ReadOnlyService from "./services/ReadOnlyService";
 import InfoService from "./services/InfoService";
 import ThrottlingService from "./services/ThrottlingService";
 import ConfigService from "./services/ConfigService";
-import { fillTextMultiLine } from "./utils";
 import html2canvas from "html2canvas";
 
 const RAD_TO_DEG = 180.0 / Math.PI;
@@ -51,7 +50,7 @@ const whiteboard = {
         whiteboardId: "0",
         username: "unknown",
         sendFunction: null,
-        backgroundGridUrl: "./images/KtEBa2.png",
+        backgroundGridUrl: "./images/gb_grid.png",
     },
     lastPointerSentTime: 0,
     /**