Merge branch 'libgdx:master' into timer

libgdx · Apr 28, 2024 · e31c43a · e31c43a
2 parents 7cb4517 + 980fa73
commit e31c43a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/gdx/src/com/badlogic/gdx/input/GestureDetector.java b/gdx/src/com/badlogic/gdx/input/GestureDetector.java
@@ -265,6 +265,7 @@ public boolean isPanning () {
 	}
 
 	public void reset () {
+		longPressTask.cancel();
 		touchDownTime = 0;
 		panning = false;
 		inTapRectangle = false;

diff --git a/gdx/src/com/badlogic/gdx/scenes/scene2d/utils/ActorGestureListener.java b/gdx/src/com/badlogic/gdx/scenes/scene2d/utils/ActorGestureListener.java
@@ -116,20 +116,20 @@ public boolean handle (Event e) {
 				event.getPointer(), event.getButton());
 			return true;
 		case touchUp:
-			if (event.isTouchFocusCancel()) {
+			boolean touchFocusCancel = event.isTouchFocusCancel();
+			if (touchFocusCancel)
 				detector.reset();
-				actor = null;
-				touchDownTarget = null;
-				return false;
+			else {
+				this.event = event;
+				actor = event.getListenerActor();
+				detector.touchUp(event.getStageX(), event.getStageY(), event.getPointer(), event.getButton());
+				actor.stageToLocalCoordinates(tmpCoords.set(event.getStageX(), event.getStageY()));
+				touchUp(event, tmpCoords.x, tmpCoords.y, event.getPointer(), event.getButton());
 			}
-			this.event = event;
-			actor = event.getListenerActor();
-			detector.touchUp(event.getStageX(), event.getStageY(), event.getPointer(), event.getButton());
-			actor.stageToLocalCoordinates(tmpCoords.set(event.getStageX(), event.getStageY()));
-			touchUp(event, tmpCoords.x, tmpCoords.y, event.getPointer(), event.getButton());
+			this.event = null;
 			actor = null;
 			touchDownTarget = null;
-			return true;
+			return !touchFocusCancel;
 		case touchDragged:
 			this.event = event;
 			actor = event.getListenerActor();
@@ -174,7 +174,6 @@ public GestureDetector getGestureDetector () {
 		return detector;
 	}
 
-	/** Returns null if there is no current touch down. */
 	public @Null Actor getTouchDownTarget () {
 		return touchDownTarget;
 	}