Merge pull request #106 from Cattlesquat/Bugfix13196

13196 Ctrl+Click toggles rather than "only" deselects
vassalengine · Jul 21, 2020 · 1b0f849 · 1b0f849
2 parents 19f7b8f + ffbbc25
commit 1b0f849
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/vassal-app/src/main/java/VASSAL/build/module/map/KeyBufferer.java b/vassal-app/src/main/java/VASSAL/build/module/map/KeyBufferer.java
@@ -128,20 +128,17 @@ public void mousePressed(MouseEvent e) {
         }
         // RFE 1629255 - If the top piece of an unexpanded stack is left-clicked
         // while not selected, then select all of the pieces in the stack
-        // RFE 1659481 - Control clicking only deselects
-        if (!SwingUtils.isControlDown(e)) {
-          if (movingStacksPickupUnits ||
-              p.getParent() == null ||
-              p.getParent().isExpanded() ||
-              SwingUtils.isRightMouseButton(e) ||
-              Boolean.TRUE.equals(p.getProperty(Properties.SELECTED)))
-          {
-            kbuf.add(p);
-          }
-          else {
-            Stack s = p.getParent();
-            s.asList().forEach(gamePiece -> KeyBuffer.getBuffer().add(gamePiece));
-          }
+        if (movingStacksPickupUnits ||
+            p.getParent() == null ||
+            p.getParent().isExpanded() ||
+            SwingUtils.isRightMouseButton(e) ||
+            Boolean.TRUE.equals(p.getProperty(Properties.SELECTED)))
+        {
+          kbuf.add(p);
+        }
+        else {
+          Stack s = p.getParent();
+          s.asList().forEach(gamePiece -> KeyBuffer.getBuffer().add(gamePiece));
         }
         // End RFE 1629255
       }
@@ -154,6 +151,9 @@ public void mousePressed(MouseEvent e) {
           }
           else if (!s.isExpanded()) {
             s.asList().forEach(gamePiece -> KeyBuffer.getBuffer().remove(gamePiece));
+          } 
+          else {
+            kbuf.remove(p);  
           }
         }
         // End RFE 1659481