From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 13 Jan 2021 22:19:38 +0000 (+0000)
Subject: click elsewhere, or on pinned piece, deselects all, only unshifted
X-Git-Tag: otter-0.3.0~23
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e79344580ea76df4f60be0caf2d49b8c598f4100;p=otter.git

click elsewhere, or on pinned piece, deselects all, only unshifted

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

diff --git a/templates/script.ts b/templates/script.ts
index a9320c1e..e5497ae7 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -672,7 +672,9 @@ function drag_mousedown(e : MouseEvent, shifted: boolean) {
   var target = e.target as SVGGraphicsElement; // we check this just now!
   var piece = target.dataset.piece!;
   if (!piece) {
-    ungrab_all();    
+    if (!shifted) {
+      ungrab_all();
+    }
     return;
   }
   let p = pieces[piece]!;
@@ -691,14 +693,13 @@ function drag_mousedown(e : MouseEvent, shifted: boolean) {
       drag_add_piece(tpiece,tp);
     }
   } else if (held == null || wresting) {
+    if (!shifted) {
+      ungrab_all();
+    }
     if (p.pinned && !wresting) {
       add_log_message('That piece is pinned to the table.');
-      ungrab_all();
       return;
     }
-    if (!shifted) {
-      ungrab_all();
-    }
     dragging = DRAGGING.MAYBE_GRAB;
     drag_add_piece(piece,p);
     set_grab(piece,p, us);