From 781877ebb60b928979f1f591cc3009ac81d5a868 Mon Sep 17 00:00:00 2001 From: lubomyr Date: Tue, 27 Mar 2018 00:34:01 +0300 Subject: [PATCH 1/3] GUICHAN: fixed blinking virtual keyboard with guichan library --- project/jni/guichan/src/widgets/textfield.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/guichan/src/widgets/textfield.cpp b/project/jni/guichan/src/widgets/textfield.cpp index 55dfd15ad..a985b1fd0 100755 --- a/project/jni/guichan/src/widgets/textfield.cpp +++ b/project/jni/guichan/src/widgets/textfield.cpp @@ -154,7 +154,7 @@ namespace gcn void TextField::mousePressed(MouseEvent& mouseEvent) { #ifdef ANDROID - if (showAndroidKeyboard) + if (showAndroidKeyboard && !SDL_IsScreenKeyboardShown(NULL)) SDL_ANDROID_ToggleScreenKeyboardTextInput(getText().c_str()); #endif if (mouseEvent.getButton() == MouseEvent::LEFT) From 16f944d3c6378589adc37e68020a214727bd62b0 Mon Sep 17 00:00:00 2001 From: pelya Date: Sun, 22 Apr 2018 00:30:47 +0300 Subject: [PATCH 2/3] SDL: disabled autodetecting screen orientation, multiwindow mode is broken anyway --- project/java/Video.java | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/project/java/Video.java b/project/java/Video.java index 3922e3e5f..0c678833d 100644 --- a/project/java/Video.java +++ b/project/java/Video.java @@ -695,30 +695,8 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer if (mWidth != 0 && mHeight != 0 && (mWidth != ww || mHeight != hh)) { Log.i("SDL", "libSDL: DemoRenderer.onWindowResize(): screen size changed from " + mWidth + "x" + mHeight + " to " + ww + "x" + hh); - if (Globals.SwVideoMode && - (Math.abs(display.getWidth() - ww) > display.getWidth() / 10 || - Math.abs(display.getHeight() - hh) > display.getHeight() / 10)) - { - Log.i("SDL", "Multiwindow detected - enabling screen orientation autodetection"); - Globals.AutoDetectOrientation = true; - context.setScreenOrientation(); - DemoRenderer.super.ResetVideoSurface(); - DemoRenderer.super.onWindowResize(ww, hh); - } - else - { - Log.i("SDL", "System button bar hidden - re-init video to avoid black bar at the top"); - DemoRenderer.super.ResetVideoSurface(); - DemoRenderer.super.onWindowResize(ww, hh); - } - } - if (mWidth == 0 && mHeight == 0) - { - if ((ww > hh) != (display.getWidth() > display.getHeight())) - { - Log.i("SDL", "Multiwindow detected - app window size " + ww + "x" + hh + " but display dimensions are " + display.getWidth() + "x" + display.getHeight()); - Globals.AutoDetectOrientation = true; - } + DemoRenderer.super.ResetVideoSurface(); + DemoRenderer.super.onWindowResize(ww, hh); } if (Globals.AutoDetectOrientation && (ww > hh) != (mWidth > mHeight)) Globals.HorizontalOrientation = (ww > hh); From 93c39846150628ffc09647300444d53ca7ea1b88 Mon Sep 17 00:00:00 2001 From: pelya Date: Sun, 22 Apr 2018 00:32:11 +0300 Subject: [PATCH 3/3] OpenLieroX: bump version --- project/jni/application/openlierox/AndroidAppSettings.cfg | 8 ++++---- project/jni/application/openlierox/src | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project/jni/application/openlierox/AndroidAppSettings.cfg b/project/jni/application/openlierox/AndroidAppSettings.cfg index b9bc2c26e..481800eab 100644 --- a/project/jni/application/openlierox/AndroidAppSettings.cfg +++ b/project/jni/application/openlierox/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenLieroX" AppFullName=openlierox.net # Application version code (integer) -AppVersionCode=10580418 +AppVersionCode=10580421 # Application user-visible version name (string) -AppVersionName="0.58rc4a18" +AppVersionName="0.58rc4a21" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -238,7 +238,7 @@ RedefinedKeysThirdGamepad="" RedefinedKeysFourthGamepad="" # How long to show startup menu button, in msec, 0 to disable startup menu -StartupMenuButtonTimeout=3000 +StartupMenuButtonTimeout=1000 # Menu items to hide from startup menu, available menu items: # SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.CommandlineConfig SettingsMenuMisc.ResetToDefaultsConfig SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout SettingsMenuKeyboard.ScreenKeyboardAdvanced @@ -264,7 +264,7 @@ APP_PLATFORM=android-21 # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a -MultiABI='armeabi-v7a' # arm64-v8a x86 x86_64 +MultiABI='armeabi-v7a arm64-v8a x86 x86_64' # arm64-v8a x86 x86_64 # Optional shared libraries to compile - removing some of them will save space # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed diff --git a/project/jni/application/openlierox/src b/project/jni/application/openlierox/src index 71e91831a..dca07a597 160000 --- a/project/jni/application/openlierox/src +++ b/project/jni/application/openlierox/src @@ -1 +1 @@ -Subproject commit 71e91831a08f3815556384b5c5f58179abc6b649 +Subproject commit dca07a597d32c8621dbf74d6485e74f4d97be18b