diff options
| author | Juan Linietsky | 2014-04-10 00:19:29 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-04-10 00:19:29 -0300 |
| commit | c74d918d570e2e7ac01643be892220982a4a4921 (patch) | |
| tree | 2a51b6a1c5cb421a69231e4ba9cea9c875632fce /platform/android/java_glue.cpp | |
| parent | 7ea3e8267afaf626256c84a9a3dc61e2954fc6a2 (diff) | |
| parent | e1970a4dda6742d9f89ce9ee60381e570f222a11 (diff) | |
| download | godot-c74d918d570e2e7ac01643be892220982a4a4921.tar.gz godot-c74d918d570e2e7ac01643be892220982a4a4921.tar.zst godot-c74d918d570e2e7ac01643be892220982a4a4921.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'platform/android/java_glue.cpp')
| -rw-r--r-- | platform/android/java_glue.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 201f08c35..8f91f7cc4 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -1245,14 +1245,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); |