From 1d9ab0641a3eddd17fbd9bd720730ea110bfcd13 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 8 Jan 2012 13:42:03 -0500 Subject: [PATCH] Made the application activity events consistent between iOS and Android --- src/core/android/SDL_android.cpp | 6 +++--- src/video/uikit/SDL_uikitappdelegate.m | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/android/SDL_android.cpp b/src/core/android/SDL_android.cpp index 1365eca81..c2c7d85f3 100755 --- a/src/core/android/SDL_android.cpp +++ b/src/core/android/SDL_android.cpp @@ -39,7 +39,7 @@ extern "C" { #define LOGE(...) do {} while (false) -/* Impelemented in audio/android/SDL_androidaudio.c */ +/* Implemented in audio/android/SDL_androidaudio.c */ extern void Android_RunAudioThread(); } // C @@ -172,8 +172,8 @@ extern "C" void Java_org_libsdl_app_SDLActivity_nativePause( JNIEnv* env, jclass cls) { if (Android_Window) { - SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_HIDDEN, 0, 0); SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_FOCUS_LOST, 0, 0); + SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_MINIMIZED, 0, 0); } } @@ -182,8 +182,8 @@ extern "C" void Java_org_libsdl_app_SDLActivity_nativeResume( JNIEnv* env, jclass cls) { if (Android_Window) { - SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_SHOWN, 0, 0); SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_FOCUS_GAINED, 0, 0); + SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_RESTORED, 0, 0); } } diff --git a/src/video/uikit/SDL_uikitappdelegate.m b/src/video/uikit/SDL_uikitappdelegate.m index 1830cc0c3..7dbee14ec 100755 --- a/src/video/uikit/SDL_uikitappdelegate.m +++ b/src/video/uikit/SDL_uikitappdelegate.m @@ -140,6 +140,7 @@ - (void) applicationWillResignActive:(UIApplication*)application SDL_Window *window; for (window = _this->windows; window != nil; window = window->next) { + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_FOCUS_LOST, 0, 0); SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MINIMIZED, 0, 0); } } @@ -156,6 +157,7 @@ - (void) applicationDidBecomeActive:(UIApplication*)application SDL_Window *window; for (window = _this->windows; window != nil; window = window->next) { + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_FOCUS_GAINED, 0, 0); SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESTORED, 0, 0); } }