Merge pull request #94468 from m4gr3d/restart_editor_when_updating_touchscreen_settings

[Android Editor] Resolve issues with the editor touchscreen settings

2 files changed, 5 insertions, 2 deletions

diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt
index 4cd3bd8db9..2929a0a0b0 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt
+++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt
@@ -76,7 +76,10 @@ internal class GodotGestureHandler(private val inputHandler: GodotInputHandler)
 	}
 
 	override fun onLongPress(event: MotionEvent) {
-		contextClickRouter(event)
+		val toolType = GodotInputHandler.getEventToolType(event)
+		if (toolType != MotionEvent.TOOL_TYPE_MOUSE) {
+			contextClickRouter(event)
+		}
 	}
 
 	private fun contextClickRouter(event: MotionEvent) {
diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
index afe570dcc6..273774a33d 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
@@ -462,7 +462,7 @@ public class GodotInputHandler implements InputManager.InputDeviceListener {
 		return button;
 	}
 
-	private static int getEventToolType(MotionEvent event) {
+	static int getEventToolType(MotionEvent event) {
 		return event.getPointerCount() > 0 ? event.getToolType(0) : MotionEvent.TOOL_TYPE_UNKNOWN;
 	}