pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made the application activity events consistent between iOS and Android

Browse source
This commit is contained in:
Sam Lantinga 2012-01-08 13:42:03 -05:00
parent f7ad18f9fc
commit d3ab037501
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/android/SDL_android.cpp
View file

@ -39,7 +39,7 @@ extern "C" {
#define LOGE(...) do {} while (false) #define LOGE(...) do {} while (false)
/* Impelemented in audio/android/SDL_androidaudio.c */ /* Implemented in audio/android/SDL_androidaudio.c */
extern void Android_RunAudioThread(); extern void Android_RunAudioThread();
} // C } // C
@ -172,8 +172,8 @@ extern "C" void Java_org_libsdl_app_SDLActivity_nativePause(
JNIEnv* env, jclass cls) JNIEnv* env, jclass cls)
{ {
if (Android_Window) { 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_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) JNIEnv* env, jclass cls)
{ {
if (Android_Window) { 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_FOCUS_GAINED, 0, 0);
SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_RESTORED, 0, 0);
} }
} }

2
src/video/uikit/SDL_uikitappdelegate.m
View file

@ -140,6 +140,7 @@ static void SDL_IdleTimerDisabledChanged(const char *name, const char *oldValue,
SDL_Window *window; SDL_Window *window;
for (window = _this->windows; window != nil; window = window->next) { 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); SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
} }
} }
@ -156,6 +157,7 @@ static void SDL_IdleTimerDisabledChanged(const char *name, const char *oldValue,
SDL_Window *window; SDL_Window *window;
for (window = _this->windows; window != nil; window = window->next) { 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); SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESTORED, 0, 0);
} }
} }