From 54df7101d7ac6b61342a64b7a0823859ed3bd734 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Fri, 6 Oct 2023 01:22:02 +0300 Subject: [PATCH] Updated submodules - AudioCodecs - MixerX --- .../main/java/org/libsdl/app/SDLActivity.java | 32 +++++++++---------- _Libs/AudioCodecs | 2 +- _Libs/SDL_Mixer_X | 2 +- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/Engine/android-project/moondust/src/main/java/org/libsdl/app/SDLActivity.java b/Engine/android-project/moondust/src/main/java/org/libsdl/app/SDLActivity.java index 7b305f281..24148609b 100644 --- a/Engine/android-project/moondust/src/main/java/org/libsdl/app/SDLActivity.java +++ b/Engine/android-project/moondust/src/main/java/org/libsdl/app/SDLActivity.java @@ -1345,23 +1345,6 @@ public static boolean handleKeyEvent(View v, int keyCode, KeyEvent event, InputC } } - if ((source & InputDevice.SOURCE_KEYBOARD) == InputDevice.SOURCE_KEYBOARD) { - if (event.getAction() == KeyEvent.ACTION_DOWN) { - if (isTextInputEvent(event)) { - if (ic != null) { - ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1); - } else { - SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1); - } - } - onNativeKeyDown(keyCode); - return true; - } else if (event.getAction() == KeyEvent.ACTION_UP) { - onNativeKeyUp(keyCode); - return true; - } - } - if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) { // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses // they are ignored here because sending them as mouse input to SDL is messy @@ -1376,6 +1359,21 @@ public static boolean handleKeyEvent(View v, int keyCode, KeyEvent event, InputC } } + if (event.getAction() == KeyEvent.ACTION_DOWN) { + if (isTextInputEvent(event)) { + if (ic != null) { + ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1); + } else { + SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1); + } + } + onNativeKeyDown(keyCode); + return true; + } else if (event.getAction() == KeyEvent.ACTION_UP) { + onNativeKeyUp(keyCode); + return true; + } + return false; } diff --git a/_Libs/AudioCodecs b/_Libs/AudioCodecs index f4f4b85cb..42d6ad217 160000 --- a/_Libs/AudioCodecs +++ b/_Libs/AudioCodecs @@ -1 +1 @@ -Subproject commit f4f4b85cb3ada2fbb5252027c275e593c5e6f036 +Subproject commit 42d6ad217d8ffb443fa14ea5cb6abadb71f0875e diff --git a/_Libs/SDL_Mixer_X b/_Libs/SDL_Mixer_X index 26c710974..14d47939b 160000 --- a/_Libs/SDL_Mixer_X +++ b/_Libs/SDL_Mixer_X @@ -1 +1 @@ -Subproject commit 26c7109749967cfc6bed66967368dcdf3b80b1fd +Subproject commit 14d47939b18664995c8d13805f1a7d9cc83c7b3e