diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-11 13:45:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 13:45:09 +0200 |
| commit | 0f9fc47234e0d4f8a3e232de0efe4696dec06c32 (patch) | |
| tree | dce42807ec2b1c040e0543df2748c6d74e8a999a | |
| parent | 0f942764ff6a0994f4b5794ddf0d5dd3e5bf91d7 (diff) | |
| parent | 08a924bcee3b4d128ddcf261a8c2fc915db486fc (diff) | |
Merge pull request #18791 from endragor/fix-ios-lifecycle
Proper focus in/out handling on iOS
| -rw-r--r-- | platform/iphone/app_delegate.mm | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/platform/iphone/app_delegate.mm b/platform/iphone/app_delegate.mm index 7ed1328b20..dd5ce4ab10 100644 --- a/platform/iphone/app_delegate.mm +++ b/platform/iphone/app_delegate.mm @@ -709,21 +709,18 @@ static int frame_count = 0; iphone_finish(); }; -- (void)applicationDidEnterBackground:(UIApplication *)application { - ///@TODO maybe add pause motionManager? and where would we unpause it? +// When application goes to background (e.g. user switches to another app or presses Home), +// then applicationWillResignActive -> applicationDidEnterBackground are called. +// When user opens the inactive app again, +// applicationWillEnterForeground -> applicationDidBecomeActive are called. - on_focus_out(view_controller, &is_focus_out); -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_WM_FOCUS_IN); - [view_controller.view startAnimation]; -} +// There are cases when applicationWillResignActive -> applicationDidBecomeActive +// sequence is called without the app going to background. For example, that happens +// if you open the app list without switching to another app or open/close the +// notification panel by swiping from the upper part of the screen. - (void)applicationWillResignActive:(UIApplication *)application { - // OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_WM_FOCUS_OUT); - [view_controller.view - stopAnimation]; // FIXME: pause seems to be recommended elsewhere + on_focus_out(view_controller, &is_focus_out); } - (void)applicationDidBecomeActive:(UIApplication *)application { |