From 723e0524acf9d1b9d781476049d95e6d8462d997 Mon Sep 17 00:00:00 2001 From: pelya Date: Mon, 16 May 2016 01:02:21 +0300 Subject: [PATCH] SDL: do not pause each frame if screen keyboard is shown without full-screen text input field, this makes built-in keyboard choppy --- project/java/Video.java | 2 +- project/jni/application/openarena/vm | 2 +- project/jni/application/openttd/AndroidAppSettings.cfg | 4 ++-- project/jni/application/openttd/src | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project/java/Video.java b/project/java/Video.java index 1ea47578b..6aa89206e 100644 --- a/project/java/Video.java +++ b/project/java/Video.java @@ -744,7 +744,7 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer this.notify(); } } - if( context.isScreenKeyboardShown() ) + if( context.isScreenKeyboardShown() && !context.keyboardWithoutTextInputShown ) { try { Thread.sleep(50); // Give some time to the keyboard input thread diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 1eae1ad05..620f69b0e 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 1eae1ad05b8139957d3ba5ffead53b16bdacf4a1 +Subproject commit 620f69b0ed09762d086d3454bfcb5ab1499f2913 diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 1c753fbc9..954dd7b61 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD" AppFullName=org.openttd.sdl # Application version code (integer) -AppVersionCode=16055 +AppVersionCode=16056 # Application user-visible version name (string) -AppVersionName="1.6.0.55" +AppVersionName="1.6.0.56" # 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 diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 481cecf6a..d408d58b5 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 481cecf6aa6802ddcc77fc3361d5467de9fcf0c7 +Subproject commit d408d58b572f4e1e95dd7bd9200eb943183e1c8e