Don't add touch blockers to circuit area when drawing custom circuit …

…gates in toolbox
adgt · Mar 24, 2019 · 32efb93 · 32efb93
1 parent 6da666c
commit 32efb93
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/draw/Painter.js b/src/draw/Painter.js
@@ -56,13 +56,25 @@ class Painter {
          * @type {!RestartableRng}
          */
         this.rng = rng;
+
+        this._ignoringTouchBlockers = 0;
+    }
+
+    startIgnoringIncomingTouchBlockers() {
+        this._ignoringTouchBlockers += 1
+    }
+
+    stopIgnoringIncomingTouchBlockers() {
+        this._ignoringTouchBlockers -= 1
     }
 
     /**
      * @param {!{rect: !Rect, cursor: undefined|!string}} blocker
      */
     noteTouchBlocker(blocker) {
-        this.touchBlockers.push(blocker);
+        if (this._ignoringTouchBlockers === 0) {
+            this.touchBlockers.push(blocker);
+        }
     }
 
     /**

diff --git a/src/ui/DisplayedToolbox.js b/src/ui/DisplayedToolbox.js
@@ -290,6 +290,7 @@ class DisplayedToolbox {
      */
     static _paintGate(painter, gate, rect, isHighlighted, stats) {
         let drawer = gate.customDrawer || GatePainting.DEFAULT_DRAWER;
+        painter.startIgnoringIncomingTouchBlockers();
         drawer(new GateDrawParams(
             painter,
             true, // inToolbox
@@ -302,6 +303,7 @@ class DisplayedToolbox {
             undefined, // positionInCircuit
             [], // focusPoints
             undefined)); // customStatsForCircuitPos
+        painter.stopIgnoringIncomingTouchBlockers();
     }
 
     /**