Merge pull request #18791 from endragor/fix-ios-lifecycle
Proper focus in/out handling on iOS
This commit is contained in:
commit
0f9fc47234
1 changed files with 9 additions and 12 deletions
|
@ -709,21 +709,18 @@ static int frame_count = 0;
|
||||||
iphone_finish();
|
iphone_finish();
|
||||||
};
|
};
|
||||||
|
|
||||||
- (void)applicationDidEnterBackground:(UIApplication *)application {
|
// When application goes to background (e.g. user switches to another app or presses Home),
|
||||||
///@TODO maybe add pause motionManager? and where would we unpause it?
|
// then applicationWillResignActive -> applicationDidEnterBackground are called.
|
||||||
|
// When user opens the inactive app again,
|
||||||
|
// applicationWillEnterForeground -> applicationDidBecomeActive are called.
|
||||||
|
|
||||||
on_focus_out(view_controller, &is_focus_out);
|
// 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
|
||||||
- (void)applicationWillEnterForeground:(UIApplication *)application {
|
// notification panel by swiping from the upper part of the screen.
|
||||||
// OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_WM_FOCUS_IN);
|
|
||||||
[view_controller.view startAnimation];
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void)applicationWillResignActive:(UIApplication *)application {
|
- (void)applicationWillResignActive:(UIApplication *)application {
|
||||||
// OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_WM_FOCUS_OUT);
|
on_focus_out(view_controller, &is_focus_out);
|
||||||
[view_controller.view
|
|
||||||
stopAnimation]; // FIXME: pause seems to be recommended elsewhere
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)applicationDidBecomeActive:(UIApplication *)application {
|
- (void)applicationDidBecomeActive:(UIApplication *)application {
|
||||||
|
|
Loading…
Reference in a new issue