diff options
| -rw-r--r-- | platform/android/java/src/com/android/godot/input/GodotTextInputWrapper.java | 8 | ||||
| -rw-r--r-- | platform/android/java_glue.cpp | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/platform/android/java/src/com/android/godot/input/GodotTextInputWrapper.java b/platform/android/java/src/com/android/godot/input/GodotTextInputWrapper.java index b003dc2376..537fa6aa76 100644 --- a/platform/android/java/src/com/android/godot/input/GodotTextInputWrapper.java +++ b/platform/android/java/src/com/android/godot/input/GodotTextInputWrapper.java @@ -65,8 +65,8 @@ public class GodotTextInputWrapper implements TextWatcher, OnEditorActionListene final String insertText = s.subSequence(this.mText.length(), s.length()).toString(); for(int i = 0; i < insertText.length(); i++) { int ch = insertText.codePointAt(i); - GodotLib.key(0, ch, false); GodotLib.key(0, ch, true); + GodotLib.key(0, ch, false); } /* if (BuildConfig.DEBUG) { @@ -75,8 +75,8 @@ public class GodotTextInputWrapper implements TextWatcher, OnEditorActionListene */ } else { for (; nModified < 0; ++nModified) { - GodotLib.key(KeyEvent.KEYCODE_DEL, 0, false); GodotLib.key(KeyEvent.KEYCODE_DEL, 0, true); + GodotLib.key(KeyEvent.KEYCODE_DEL, 0, false); /* if (BuildConfig.DEBUG) { Log.d(TAG, "deleteBackward"); @@ -107,8 +107,8 @@ public class GodotTextInputWrapper implements TextWatcher, OnEditorActionListene if (this.mEdit == pTextView && this.isFullScreenEdit()) { // user press the action button, delete all old text and insert new text for (int i = this.mOriginText.length(); i > 0; i--) { - GodotLib.key(KeyEvent.KEYCODE_DEL, 0, false); GodotLib.key(KeyEvent.KEYCODE_DEL, 0, true); + GodotLib.key(KeyEvent.KEYCODE_DEL, 0, false); /* if (BuildConfig.DEBUG) { Log.d(TAG, "deleteBackward"); @@ -128,8 +128,8 @@ public class GodotTextInputWrapper implements TextWatcher, OnEditorActionListene for(int i = 0; i < text.length(); i++) { int ch = text.codePointAt(i); - GodotLib.key(0, ch, false); GodotLib.key(0, ch, true); + GodotLib.key(0, ch, false); } /* if (BuildConfig.DEBUG) { diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 0f05992112..127aeb7756 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -1199,14 +1199,16 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_key(JNIEnv * env, jobject ievent.key.mod.control=false; ievent.key.echo=false; - if (val == 61448) { + if (val == '\n') + { + ievent.key.scancode = KEY_ENTER; + }else if (val == 61448) { ievent.key.scancode = KEY_BACKSPACE; ievent.key.unicode = KEY_BACKSPACE; - }; - if (val == 61453) { + } else if (val == 61453) { ievent.key.scancode = KEY_ENTER; ievent.key.unicode = KEY_ENTER; - }; + } input_mutex->lock(); key_events.push_back(ievent); |