Cleanup of DragAndDrop simultaneous drag patch

Fixes issues pointed out by @bitiotic

diff --git a/gdx/src/com/badlogic/gdx/scenes/scene2d/utils/DragAndDrop.java b/gdx/src/com/badlogic/gdx/scenes/scene2d/utils/DragAndDrop.java
index ba26bb5..a74d300 100644 (file)
--- a/gdx/src/com/badlogic/gdx/scenes/scene2d/utils/DragAndDrop.java
+++ b/gdx/src/com/badlogic/gdx/scenes/scene2d/utils/DragAndDrop.java
@@ -40,23 +40,18 @@ public class DragAndDrop {
        float dragActorX = 14, dragActorY = -20;
        long dragStartTime;
        int dragTime = 250;
-       boolean isDragging = false;
-       Object dragSyncObj = new Object();
-       int activePointer;
+       int activePointer = -1;
 
        public void addSource (final Source source) {
                DragListener listener = new DragListener() {
                        public void dragStart (InputEvent event, float x, float y, int pointer) {
-                               synchronized (dragSyncObj) {
-                                       if (isDragging) {
-                                               event.stop();
-                                               return;
-                                       }
-
-                                       isDragging = true;
-                                       activePointer = pointer;
+                               if (activePointer != -1) {
+                                       event.stop();
+                                       return;
                                }
 
+                               activePointer = pointer;
+
                                dragStartTime = System.currentTimeMillis();
                                payload = source.dragStart(event, getTouchDownX(), getTouchDownY(), pointer);
                                event.stop();
@@ -119,9 +114,7 @@ public class DragAndDrop {
                                if (payload == null) return;
                                if (pointer != activePointer) return;
 
-                               synchronized (dragSyncObj) {
-                                       isDragging = false;
-                               }
+                               activePointer = -1;
 
                                if (System.currentTimeMillis() - dragStartTime < dragTime) isValidTarget = false;
                                if (dragActor != null) dragActor.remove();