From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 3 Apr 2021 23:40:54 +0000 (+0100)
Subject: js: Handle special_count of >1, do not pick 4 topmost whatever
X-Git-Tag: otter-0.5.0~210
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4c42d0f1ce5cd6b34349a5ede8b5a9959057645d;p=otter.git

js: Handle special_count of >1, do not pick 4 topmost whatever

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

diff --git a/templates/script.ts b/templates/script.ts
index ab73bb94..bc1cb835 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -846,6 +846,7 @@ function drag_mousedown(e : MouseEvent, shifted: boolean) {
     }
   } else {
     // special_count > 0
+    let clickpos = mouseevent_pos(e);
     clicked = [];
     let uelem = defs_marker;
     for (let i=0; i<special_count; i++) {
@@ -856,6 +857,9 @@ function drag_mousedown(e : MouseEvent, shifted: boolean) {
       }
       let piece = uelem.dataset.piece!;
       let p = pieces[piece];
+      if (!p_bbox_contains(p, clickpos)) {
+	continue;
+      }
       if (i > 0) {
 	if (p.pinned != pinned ||
 	    p.held   != held) {