[Draft] Add touch support to TextEdit

Author: m4gr3d

doc/classes/TextEdit.xml

@@ -702,6 +702,11 @@
 				Returns the current version of the [TextEdit]. The version is a count of recorded operations by the undo/redo history.
 			</description>
 		</method>
+		<method name="get_virtual_keyboard_show_on_double_tap" qualifiers="const">
+			<return type="bool" />
+			<description>
+			</description>
+		</method>
 		<method name="get_visible_line_count" qualifiers="const">
 			<return type="int" />
 			<description>
@@ -1252,6 +1257,12 @@
 				Provide custom tooltip text. The callback method must take the following args: [code]hovered_word: String[/code].
 			</description>
 		</method>
+		<method name="set_virtual_keyboard_show_on_double_tap">
+			<return type="void" />
+			<param index="0" name="show_on_double_tap" type="bool" />
+			<description>
+			</description>
+		</method>
 		<method name="skip_selection_for_next_occurrence">
 			<return type="void" />
 			<description>

editor/gui/code_editor.cpp

@@ -951,14 +951,12 @@ void CodeTextEditor::_text_editor_gui_input(const Ref<InputEvent> &p_event) {
 		}
 	}
 
-#ifndef ANDROID_ENABLED
 	Ref<InputEventMagnifyGesture> magnify_gesture = p_event;
 	if (magnify_gesture.is_valid()) {
 		_zoom_to(zoom_factor * std::pow(magnify_gesture->get_factor(), 0.25f));
 		accept_event();
 		return;
 	}
-#endif
 
 	Ref<InputEventKey> k = p_event;
 
@@ -1887,7 +1885,7 @@ void CodeTextEditor::_zoom_out() {
 }
 
 void CodeTextEditor::_zoom_to(float p_zoom_factor) {
-	if (zoom_factor == p_zoom_factor) {
+	if (Math::is_equal_approx(zoom_factor, p_zoom_factor)) {
 		return;
 	}
 
@@ -1962,6 +1960,7 @@ CodeTextEditor::CodeTextEditor() {
 	text_editor->set_draw_bookmarks_gutter(true);
 
 	text_editor->set_virtual_keyboard_show_on_focus(false);
+	text_editor->set_virtual_keyboard_show_on_double_tap(true);
 	text_editor->set_draw_line_numbers(true);
 	text_editor->set_highlight_matching_braces_enabled(true);
 	text_editor->set_auto_indent_enabled(true);

platform/android/android_input_handler.cpp

@@ -146,7 +146,7 @@ void AndroidInputHandler::_cancel_all_touch() {
 	touch.clear();
 }
 
-void AndroidInputHandler::_parse_all_touch(bool p_pressed, bool p_canceled, bool p_double_tap) {
+void AndroidInputHandler::_parse_all_touch(bool p_pressed, bool p_canceled) {
 	if (touch.size()) {
 		//end all if exist
 		for (int i = 0; i < touch.size(); i++) {
@@ -156,7 +156,7 @@ void AndroidInputHandler::_parse_all_touch(bool p_pressed, bool p_canceled, bool
 			ev->set_pressed(p_pressed);
 			ev->set_canceled(p_canceled);
 			ev->set_position(touch[i].pos);
-			ev->set_double_tap(p_double_tap);
+			ev->set_double_tap(touch[i].double_tap);
 			Input::get_singleton()->parse_input_event(ev);
 		}
 	}
@@ -167,7 +167,7 @@ void AndroidInputHandler::_release_all_touch() {
 	touch.clear();
 }
 
-void AndroidInputHandler::process_touch_event(int p_event, int p_pointer, const Vector<TouchPos> &p_points, bool p_double_tap) {
+void AndroidInputHandler::process_touch_event(int p_event, int p_pointer, const Vector<TouchPos> &p_points) {
 	switch (p_event) {
 		case AMOTION_EVENT_ACTION_DOWN: { //gesture begin
 			// Release any remaining touches or mouse event
@@ -180,10 +180,11 @@ void AndroidInputHandler::process_touch_event(int p_event, int p_pointer, const
 				touch.write[i].pos = p_points[i].pos;
 				touch.write[i].pressure = p_points[i].pressure;
 				touch.write[i].tilt = p_points[i].tilt;
+				touch.write[i].double_tap = p_points[i].double_tap;
 			}
 
 			//send touch
-			_parse_all_touch(true, false, p_double_tap);
+			_parse_all_touch(true, false);
 
 		} break;
 		case AMOTION_EVENT_ACTION_MOVE: { //motion

platform/android/android_input_handler.h

@@ -43,6 +43,7 @@ class AndroidInputHandler {
 		Point2 pos;
 		float pressure = 0;
 		Vector2 tilt;
+		bool double_tap = false;
 	};
 
 	struct MouseEventInfo {
@@ -90,15 +91,15 @@ class AndroidInputHandler {
 
 	void _cancel_mouse_event_info(bool p_source_mouse_relative = false);
 
-	void _parse_all_touch(bool p_pressed, bool p_canceled = false, bool p_double_tap = false);
+	void _parse_all_touch(bool p_pressed, bool p_canceled = false);
 
 	void _release_all_touch();
 
 	void _cancel_all_touch();
 
 public:
 	void process_mouse_event(int p_event_action, int p_event_android_buttons_mask, Point2 p_event_pos, Vector2 p_delta, bool p_double_click, bool p_source_mouse_relative, float p_pressure, Vector2 p_tilt);
-	void process_touch_event(int p_event, int p_pointer, const Vector<TouchPos> &p_points, bool p_double_tap);
+	void process_touch_event(int p_event, int p_pointer, const Vector<TouchPos> &p_points);
 	void process_magnify(Point2 p_pos, float p_factor);
 	void process_pan(Point2 p_pos, Vector2 p_delta);
 	void process_joy_event(JoypadEvent p_event);

platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotGestureHandler.kt

@@ -30,13 +30,10 @@
 
 package org.godotengine.godot.input
 
-import android.os.Build
 import android.view.GestureDetector.SimpleOnGestureListener
-import android.view.InputDevice
 import android.view.MotionEvent
 import android.view.ScaleGestureDetector
 import android.view.ScaleGestureDetector.OnScaleGestureListener
-import org.godotengine.godot.GodotLib
 
 /**
  * Handles regular and scale gesture input related events for the [GodotView] view.
@@ -51,12 +48,19 @@ internal class GodotGestureHandler(private val inputHandler: GodotInputHandler)
 	}
 
 	/**
-	 * Enable pan and scale gestures
+	 * Enable panning gestures.
 	 */
-	var panningAndScalingEnabled = false
+	var panningEnabled = false
+
+	/**
+	 * Enable scaling gestures.
+	 */
+	var scalingEnabled = false
 
 	var scrollDeadzoneDisabled = false
 
+	var longPressEnabled = false
+
 	/**
 	 * Enable haptic feedback on long-press right-click
 	 */
@@ -181,15 +185,22 @@ internal class GodotGestureHandler(private val inputHandler: GodotInputHandler)
 	override fun onDoubleTapEvent(event: MotionEvent): Boolean {
 		if (event.actionMasked == MotionEvent.ACTION_UP) {
 			nextDownIsDoubleTap = false
-			inputHandler.handleMotionEvent(event)
-		} else if (event.actionMasked == MotionEvent.ACTION_MOVE && !panningAndScalingEnabled) {
+
+			// Long press is restored to its previous value.
+			inputHandler.gestureDetector.setIsLongpressEnabled(longPressEnabled)
+
+			inputHandler.handleMotionEvent(event, event.actionMasked, true)
+		} else if (event.actionMasked == MotionEvent.ACTION_MOVE && !(scalingEnabled && inputHandler.scaleGestureDetector.isQuickScaleEnabled)) {
 			inputHandler.handleMotionEvent(event)
 		}
 
 		return true
 	}
 
 	override fun onDoubleTap(event: MotionEvent): Boolean {
+		// Long press is disabled as it interferes with double tap events.
+		inputHandler.gestureDetector.setIsLongpressEnabled(false)
+
 		nextDownIsDoubleTap = true
 		return true
 	}
@@ -214,7 +225,7 @@ internal class GodotGestureHandler(private val inputHandler: GodotInputHandler)
 
 		val x = terminusEvent.x
 		val y = terminusEvent.y
-		if (terminusEvent.pointerCount >= 2 && panningAndScalingEnabled && !pointerCaptureInProgress && !dragInProgress) {
+		if (terminusEvent.pointerCount >= 2 && panningEnabled && !pointerCaptureInProgress && !dragInProgress) {
 			inputHandler.handlePanEvent(x, y, distanceX / 5f, distanceY / 5f)
 		} else if (!scaleInProgress) {
 			dragInProgress = true
@@ -226,7 +237,7 @@ internal class GodotGestureHandler(private val inputHandler: GodotInputHandler)
 	}
 
 	override fun onScale(detector: ScaleGestureDetector): Boolean {
-		if (!panningAndScalingEnabled || pointerCaptureInProgress || dragInProgress) {
+		if (!scalingEnabled || pointerCaptureInProgress || dragInProgress) {
 			return false
 		}
 
@@ -237,7 +248,7 @@ internal class GodotGestureHandler(private val inputHandler: GodotInputHandler)
 	}
 
 	override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
-		if (!panningAndScalingEnabled || pointerCaptureInProgress || dragInProgress) {
+		if (!scalingEnabled || pointerCaptureInProgress || dragInProgress) {
 			return false
 		}
 		scaleInProgress = true

platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java

@@ -88,8 +88,8 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
 	private final Godot godot;
 	private final InputManager mInputManager;
 	private final WindowManager windowManager;
-	private final GestureDetector gestureDetector;
-	private final ScaleGestureDetector scaleGestureDetector;
+	final GestureDetector gestureDetector;
+	final ScaleGestureDetector scaleGestureDetector;
 	private final GodotGestureHandler godotGestureHandler;
 
 	/**
@@ -112,9 +112,12 @@ public GodotInputHandler(Context context, Godot godot) {
 
 		this.godotGestureHandler = new GodotGestureHandler(this);
 		this.gestureDetector = new GestureDetector(context, godotGestureHandler);
-		this.gestureDetector.setIsLongpressEnabled(false);
+		enableLongPress(false);
+
 		this.scaleGestureDetector = new ScaleGestureDetector(context, godotGestureHandler);
 		this.scaleGestureDetector.setStylusScaleEnabled(true);
+		this.scaleGestureDetector.setQuickScaleEnabled(false);
+
 		Configuration config = context.getResources().getConfiguration();
 		hasHardwareKeyboardConfig = config.keyboard != Configuration.KEYBOARD_NOKEYS &&
 				config.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO;
@@ -125,6 +128,7 @@ public GodotInputHandler(Context context, Godot godot) {
 	 */
 	public void enableLongPress(boolean enable) {
 		this.gestureDetector.setIsLongpressEnabled(enable);
+		this.godotGestureHandler.setLongPressEnabled(enable);
 	}
 
 	/**
@@ -157,7 +161,8 @@ void performHapticFeedback() {
 	 * Note: This may interfere with multi-touch handling / support.
 	 */
 	public void enablePanningAndScalingGestures(boolean enable) {
-		this.godotGestureHandler.setPanningAndScalingEnabled(enable);
+		this.godotGestureHandler.setPanningEnabled(enable);
+		this.godotGestureHandler.setScalingEnabled(enable);
 	}
 
 	/**

platform/android/java_godot_lib_jni.cpp

@@ -362,10 +362,11 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_dispatchTouchEvent(JN
 		tp.pos = Point2(p[1], p[2]);
 		tp.pressure = p[3];
 		tp.tilt = Vector2(p[4], p[5]);
+		tp.double_tap = p_double_tap;
 		points.push_back(tp);
 	}
 
-	input_handler->process_touch_event(ev, pointer, points, p_double_tap);
+	input_handler->process_touch_event(ev, pointer, points);
 }
 
 // Called on the UI thread