From 1cf38d92ef05d00563cf76cdf8363de7563ce613 Mon Sep 17 00:00:00 2001
From: Peli de Halleux <pelikhan@users.noreply.github.com>
Date: Wed, 19 Apr 2017 23:44:47 -0700
Subject: [PATCH] support for high contrast in simulator (#386)

* support for high contrast in simulator

* updated logic to find afterProgramPage.
---
 pxtarget.json            |  3 ++-
 sim/dalboard.ts          |  4 +++-
 sim/visuals/boardview.ts |  4 ++--
 sim/visuals/microbit.ts  | 22 +++++++++++++++++++---
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/pxtarget.json b/pxtarget.json
index 51d8dabe..de723ee9 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -339,6 +339,7 @@
                 "colour": "rgba(189, 195, 199, 0.30)",
                 "snap": false
             }
-        }
+        },
+        "highContrast": true
     }
 }
diff --git a/sim/dalboard.ts b/sim/dalboard.ts
index 184c9b22..32de0146 100644
--- a/sim/dalboard.ts
+++ b/sim/dalboard.ts
@@ -120,9 +120,11 @@ namespace pxsim {
                 fnArgs: fnArgs,
                 maxWidth: "100%",
                 maxHeight: "100%",
+                highContrast: msg.highContrast
             };
             const viewHost = new visuals.BoardHost(pxsim.visuals.mkBoardView({
-                visual: boardDef.visual
+                visual: boardDef.visual,
+                highContrast: msg.highContrast
             }), opts);
 
             document.body.innerHTML = ""; // clear children
diff --git a/sim/visuals/boardview.ts b/sim/visuals/boardview.ts
index 3691f9db..9096285c 100644
--- a/sim/visuals/boardview.ts
+++ b/sim/visuals/boardview.ts
@@ -2,9 +2,9 @@ namespace pxsim.visuals {
     mkBoardView = (opts: BoardViewOptions): BoardView => {
         return new visuals.MicrobitBoardSvg({
             runtime: runtime,
-            theme: visuals.randomTheme(),
+            theme: visuals.randomTheme(opts.highContrast),
             disableTilt: false,
-            wireframe: opts.wireframe,
+            wireframe: opts.wireframe
         });
     }
 }
\ No newline at end of file
diff --git a/sim/visuals/microbit.ts b/sim/visuals/microbit.ts
index 79eae3a2..5efc042d 100644
--- a/sim/visuals/microbit.ts
+++ b/sim/visuals/microbit.ts
@@ -136,6 +136,11 @@ namespace pxsim.visuals {
             stroke-width: 2px;
         }
     `;
+    const MB_HIGHCONTRAST = `
+.sim-led {
+    stroke: red;
+}    
+    `
     const pins4onXs = [66.7, 79.1, 91.4, 103.7, 164.3, 176.6, 188.9, 201.3, 213.6, 275.2, 287.5, 299.8, 312.1, 324.5, 385.1, 397.4, 409.7, 422];
     const pins4onMids = pins4onXs.map(x => x + 5);
     const littlePinDist = pins4onMids[1] - pins4onMids[0];
@@ -179,6 +184,7 @@ namespace pxsim.visuals {
     const MB_WIDTH = 500;
     const MB_HEIGHT = 408;
     export interface IBoardTheme {
+        highContrast?: boolean;
         accent?: string;
         display?: string;
         pin?: string;
@@ -215,8 +221,18 @@ namespace pxsim.visuals {
         }
     });
 
-    export function randomTheme(): IBoardTheme {
-        return themes[Math.floor(Math.random() * themes.length)];
+    export function randomTheme(highContrast?: boolean): IBoardTheme {
+        let theme = themes[Math.floor(Math.random() * themes.length)];
+        if (highContrast) {
+            theme = JSON.parse(JSON.stringify(theme)) as IBoardTheme;
+            theme.highContrast = true;
+            theme.ledOff = "#888";
+            theme.ledOn = "#0000bb";
+            theme.display = "#ffffff";
+            theme.pin = "#D4AF37";
+            theme.accent = "#273EE2";
+        }
+        return theme;
     }
 
     export interface IBoardProps {
@@ -581,7 +597,7 @@ namespace pxsim.visuals {
                 "height": MB_HEIGHT + "px",
             });
             this.style = <SVGStyleElement>svg.child(this.element, "style", {});
-            this.style.textContent = MB_STYLE;
+            this.style.textContent = MB_STYLE + (this.props.theme.highContrast ? MB_HIGHCONTRAST : "");
 
             this.defs = <SVGDefsElement>svg.child(this.element, "defs", {});
             this.g = <SVGGElement>svg.elt("g");