From b7bea2773d9c3a11dd6f482e555519d8d30bdb85 Mon Sep 17 00:00:00 2001 From: pelya Date: Sun, 2 Mar 2014 21:06:54 +0200 Subject: [PATCH] Updated TODO --- project/jni/application/teeworlds/AndroidAppSettings.cfg | 2 +- project/jni/application/teeworlds/src | 2 +- .../sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c | 7 +++++++ todo.txt | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/project/jni/application/teeworlds/AndroidAppSettings.cfg b/project/jni/application/teeworlds/AndroidAppSettings.cfg index c96ce7fea..b22d41f51 100644 --- a/project/jni/application/teeworlds/AndroidAppSettings.cfg +++ b/project/jni/application/teeworlds/AndroidAppSettings.cfg @@ -151,7 +151,7 @@ AccessSdCard= AccessInternet= # Immersive mode - Android will hide on-screen Home/Back keys. Looks bad if you invoke Android keyboard. (y) / (n) -ImmersiveMode= +ImmersiveMode=y # Application implements Android-specific routines to put to background, and will not draw anything to screen # between SDL_ACTIVEEVENT lost / gained notifications - you should check for them diff --git a/project/jni/application/teeworlds/src b/project/jni/application/teeworlds/src index 37b9351ac..4963b4df0 160000 --- a/project/jni/application/teeworlds/src +++ b/project/jni/application/teeworlds/src @@ -1 +1 @@ -Subproject commit 37b9351ac13c25513a95547044abdd2465820030 +Subproject commit 4963b4df0253d29ca100e599229531ddbc929bdf 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 d3025e481..df2791aa1 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 @@ -586,6 +586,13 @@ JAVA_EXPORT_NAME(Settings_nativeSetupScreenKeyboard) ( JNIEnv* env, jobject thi int nbuttons1row, nbuttons2row; int _nbuttons = MAX_BUTTONS; SDL_Rect * r; + + // 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; + if( screenRatio < STANDARD_PHONE_SCREEN_HEIGHT ) + screenRatio = STANDARD_PHONE_SCREEN_HEIGHT; + touchscreenKeyboardTheme = theme; // TODO: works for horizontal screen orientation only! buttonsize = size; diff --git a/todo.txt b/todo.txt index 6e3009d91..012bbb688 100644 --- a/todo.txt +++ b/todo.txt @@ -1,8 +1,6 @@ TODO, which will get actually done ================================== -- TeeWorlds: after exiting phone lock screen the video is screwed up. - - TeeWorlds: infinite loop while trying to enter chat text with gamepad. - TeeWorlds: navigate UI with gamepad. @@ -15,4 +13,6 @@ TODO, which will get actually done - SDL: cloud save support. +- SDL: resize default on-screen buttons for different screen sizes. + - SuperTux: Update, enable OpenGL renderer, add touchscreen jump helper, add gamepad support, fix zoom in settings.