From 403456b033d9484c8abceec4a2a0cb6e85033a3e Mon Sep 17 00:00:00 2001 From: pelya Date: Sun, 2 Mar 2014 21:31:30 +0200 Subject: [PATCH] Fixed my prev commit --- project/java/Settings.java | 4 ++++ .../jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/project/java/Settings.java b/project/java/Settings.java index b1986dadd..8147373fe 100644 --- a/project/java/Settings.java +++ b/project/java/Settings.java @@ -506,6 +506,7 @@ class Settings static void Apply(MainActivity p) { + setEnvVars(); nativeSetVideoDepth(Globals.VideoDepthBpp, Globals.NeedGles2 ? 1 : 0); if(Globals.VideoLinearFilter) nativeSetVideoLinearFilter(); @@ -569,7 +570,10 @@ class Settings if( Globals.TouchscreenCalibration[2] > Globals.TouchscreenCalibration[0] ) nativeSetTouchscreenCalibration(Globals.TouchscreenCalibration[0], Globals.TouchscreenCalibration[1], Globals.TouchscreenCalibration[2], Globals.TouchscreenCalibration[3]); + } + static void setEnvVars() + { String lang = new String(Locale.getDefault().getLanguage()); if( Locale.getDefault().getCountry().length() > 0 ) lang = lang + "_" + Locale.getDefault().getCountry(); diff --git a/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c b/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c index df2791aa1..a4872ba8a 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c @@ -589,7 +589,7 @@ JAVA_EXPORT_NAME(Settings_nativeSetupScreenKeyboard) ( JNIEnv* env, jobject thi // TODO: screenRatio is not used yet enum { STANDARD_PHONE_SCREEN_HEIGHT = 70 }; // And by "standard phone", I mean my own. - float screenRatio = atoi(getenv("DISPLAY_HEIGHT_MM")) / STANDARD_PHONE_SCREEN_HEIGHT; + float screenRatio = getenv("DISPLAY_HEIGHT_MM") ? atoi(getenv("DISPLAY_HEIGHT_MM")) / STANDARD_PHONE_SCREEN_HEIGHT : 1.0f; if( screenRatio < STANDARD_PHONE_SCREEN_HEIGHT ) screenRatio = STANDARD_PHONE_SCREEN_HEIGHT;