miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed my prev commit

Browse Source
This commit is contained in:
pelya
2014-03-02 21:31:30 +02:00
parent b7bea2773d
commit 403456b033
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/java/Settings.java
View File

@@ -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();

2
project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c
View File

@@ -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;