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

Sanity check for SdlVideoResizeKeepAspect.

Browse Source
This commit is contained in:
Sergii Pylypenko
2013-11-20 23:22:56 +02:00
parent c2c958c91c
commit 784ddc3520
7 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/jni/application/ballfield/AndroidAppSettings.cfg
View File

@@ -47,7 +47,7 @@ SwVideoMode=y
SdlVideoResize=y
# Application resizing will keep 4:3 aspect ratio, with black bars at sides (y)/(n)
SdlVideoResizeKeepAspect=n
SdlVideoResizeKeepAspect=y
CompatibilityHacksProperUsageOfSDL_UpdateRects=y

2
project/jni/application/ballfield/ballfield.cpp
View File

@@ -26,7 +26,7 @@
----------------------------------------------------------*/
#define SCREEN_W 640
#define SCREEN_H 480
#define SCREEN_H 256
#define BALLS 300

2
project/jni/application/openarena/engine

Submodule project/jni/application/openarena/engine updated: 07c011b6cc...30e98be358

2
project/jni/application/openarena/vm

Submodule project/jni/application/openarena/vm updated: 4b83db91ab...278f045202

2
project/jni/application/teeworlds/src

Submodule project/jni/application/teeworlds/src updated: 34b64249c4...e5489c8c08

2
project/jni/application/xserver/xserver

Submodule project/jni/application/xserver/xserver updated: fe78614169...b4dd6771eb

3
project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
View File

@@ -388,7 +388,8 @@ SDL_Surface *ANDROID_SetVideoMode(_THIS, SDL_Surface *current,
SDL_ANDROID_sWindowHeight = SDL_ANDROID_sRealWindowHeight;
SDL_ANDROID_ForceClearScreenRectAmount = 0;
if( SDL_ANDROID_ScreenKeep43Ratio )
if( SDL_ANDROID_ScreenKeep43Ratio &&
(float)width / (float)height < (float)SDL_ANDROID_sWindowWidth / (float)SDL_ANDROID_sWindowHeight )
{
SDL_ANDROID_sWindowWidth = (SDL_ANDROID_sFakeWindowWidth * SDL_ANDROID_sRealWindowHeight) / SDL_ANDROID_sFakeWindowHeight;
SDL_ANDROID_TouchscreenCalibrationWidth = SDL_ANDROID_sWindowWidth;