diff options
| author | Juan Linietsky | 2017-07-17 21:05:38 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-07-17 22:18:58 -0300 |
| commit | bbada82f8088e18b663f087484fcbb662dd76a5a (patch) | |
| tree | 5ea77e84771dd4502cef44642001a689fab3cd87 /platform/iphone | |
| parent | f36cd77feb9790847c6123eccfa18be74fc89b32 (diff) | |
| download | godot-bbada82f8088e18b663f087484fcbb662dd76a5a.tar.gz godot-bbada82f8088e18b663f087484fcbb662dd76a5a.tar.zst godot-bbada82f8088e18b663f087484fcbb662dd76a5a.zip | |
-Reorganized all properties of project settings (Sorry, Again).
(Lot's of bloat accumulated, so it was time for clean up.)
-Made EditorSettings and ProjectSettings search more useful (search in sections too)
Diffstat (limited to 'platform/iphone')
| -rw-r--r-- | platform/iphone/app_delegate.mm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/platform/iphone/app_delegate.mm b/platform/iphone/app_delegate.mm index 1f81f0f86..b6cd43b3a 100644 --- a/platform/iphone/app_delegate.mm +++ b/platform/iphone/app_delegate.mm @@ -29,11 +29,11 @@ /*************************************************************************/ #import "app_delegate.h" +#include "audio_driver_iphone.h" #include "core/global_config.h" #import "gl_view.h" #include "main/main.h" #include "os_iphone.h" -#include "audio_driver_iphone.h" #ifdef MODULE_FACEBOOKSCORER_IOS_ENABLED #include "modules/FacebookScorer_ios/FacebookScorer.h" @@ -615,7 +615,7 @@ static int frame_count = 0; view_controller.view = glView; window.rootViewController = view_controller; - _set_keep_screen_on(bool(GLOBAL_DEF("display/keep_screen_on", true)) ? YES : NO); + _set_keep_screen_on(bool(GLOBAL_DEF("display/window/keep_screen_on", true)) ? YES : NO); glView.useCADisplayLink = bool(GLOBAL_DEF("display.iOS/use_cadisplaylink", true)) ? YES : NO; printf("cadisaplylink: %d", glView.useCADisplayLink); @@ -673,7 +673,6 @@ static int frame_count = 0; isAdvertisingTrackingEnabled]]; #endif - }; - (void)applicationWillTerminate:(UIApplication *)application { @@ -737,7 +736,7 @@ static int frame_count = 0; }; // Fixed audio can not resume if it is interrupted cause by an incoming phone call - if(AudioDriverIphone::get_singleton() != NULL) + if (AudioDriverIphone::get_singleton() != NULL) AudioDriverIphone::get_singleton()->start(); } |