Merge pull request #4888 from bubblobill/campMoveMacro

Modify ButtonGroup drag to check for no change
RPTools · Sep 12, 2024 · c0df1db · c0df1db
2 parents 0768d47 + 11e8665
commit c0df1db
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/net/rptools/maptool/client/ui/macrobuttons/buttongroups/ButtonGroup.java b/src/main/java/net/rptools/maptool/client/ui/macrobuttons/buttongroups/ButtonGroup.java
@@ -128,7 +128,10 @@ public void drop(DropTargetDropEvent event) {
       MacroButtonProperties oldMacroProps = new MacroButtonProperties(tempProperties);
 
       // stops players from moving macros into/from the Campaign/GM panels
-      if (!MapTool.getPlayer().isGM()
+      // debounce first, ignore moves that change nothing
+      if (tempProperties.getGroup().equals(getMacroGroup())) {
+        event.dropComplete(false);
+      } else if (!MapTool.getPlayer().isGM()
           && (panelClass.equals("CampaignPanel")
               || panelClass.equals("GmPanel")
               || (data.panelClass.equals("CampaignPanel")