diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-06-04 16:07:01 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-06-08 17:43:17 +0200 |
| commit | 46be48730333120a7b939116cef075e61c12c703 (patch) | |
| tree | 92bde033dd93fc14e0e2565a52293b59787b8859 /android/skin/window.c | |
| parent | b72269abe4a75736c09b0ee8797b736f49c058c8 (diff) | |
| download | external_qemu-46be48730333120a7b939116cef075e61c12c703.zip external_qemu-46be48730333120a7b939116cef075e61c12c703.tar.gz external_qemu-46be48730333120a7b939116cef075e61c12c703.tar.bz2 | |
Add our modified SDL sources under distrib/sdl-1.2.12
Fix distrib/make-distrib.sh script to work with git
Fix distrib/build-emulator.sh to accomodate for new SDL configure script
Handle Tiger SDK usage in SDL configure script
Diffstat (limited to 'android/skin/window.c')
| -rw-r--r-- | android/skin/window.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/android/skin/window.c b/android/skin/window.c index 7ce5759..674b594 100644 --- a/android/skin/window.c +++ b/android/skin/window.c @@ -14,7 +14,6 @@ #include "android/skin/scaler.h" #include "android/charmap.h" #include "android/utils/debug.h" -#include "android/utils/display.h" #include "android/hw-sensors.h" #include <SDL_syswm.h> #include "qemu-common.h" @@ -1107,12 +1106,19 @@ skin_window_resize( SkinWindow* window ) int fullscreen = window->fullscreen; if (fullscreen) { - if (get_nearest_monitor_rect(&window_x, &window_y, - &window_w, &window_h) < 0) { + SDL_Rect r; + if (SDL_WM_GetMonitorRect(&r) < 0) { fullscreen = 0; } else { - double x_scale = window_w * 1.0 / layout_w; - double y_scale = window_h * 1.0 / layout_h; + double x_scale, y_scale; + + window_x = r.x; + window_y = r.y; + window_w = r.w; + window_h = r.h; + + x_scale = window_w * 1.0 / layout_w; + y_scale = window_h * 1.0 / layout_h; scale = (x_scale <= y_scale) ? x_scale : y_scale; } |