Browse Source

Merge pull request #20192 from volzhs/keep-screen-on-android

Fix keep screen on property path for Android/iOS/UWP
Max Hilbrunner 7 years ago
parent
commit
dd4b4e56af

+ 1 - 1
platform/android/java/src/org/godotengine/godot/Godot.java

@@ -297,7 +297,7 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
 				runOnUiThread(new Runnable() {
 				runOnUiThread(new Runnable() {
 					@Override
 					@Override
 					public void run() {
 					public void run() {
-						view.setKeepScreenOn("True".equals(GodotLib.getGlobal("display/driver/keep_screen_on")));
+						view.setKeepScreenOn("True".equals(GodotLib.getGlobal("display/window/energy_saving/keep_screen_on")));
 					}
 					}
 				});
 				});
 			}
 			}

+ 1 - 1
platform/iphone/app_delegate.mm

@@ -643,7 +643,7 @@ static int frame_count = 0;
 	view_controller.view = glView;
 	view_controller.view = glView;
 	window.rootViewController = view_controller;
 	window.rootViewController = view_controller;
 
 
-	_set_keep_screen_on(bool(GLOBAL_DEF("display/window/keep_screen_on", true)) ? YES : NO);
+	_set_keep_screen_on(bool(GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true)) ? YES : NO);
 	glView.useCADisplayLink =
 	glView.useCADisplayLink =
 			bool(GLOBAL_DEF("display.iOS/use_cadisplaylink", true)) ? YES : NO;
 			bool(GLOBAL_DEF("display.iOS/use_cadisplaylink", true)) ? YES : NO;
 	printf("cadisaplylink: %d", glView.useCADisplayLink);
 	printf("cadisaplylink: %d", glView.useCADisplayLink);

+ 1 - 1
platform/uwp/os_uwp.cpp

@@ -290,7 +290,7 @@ Error OSUWP::initialize(const VideoMode &p_desired, int p_video_driver, int p_au
 	if (is_keep_screen_on())
 	if (is_keep_screen_on())
 		display_request->RequestActive();
 		display_request->RequestActive();
 
 
-	set_keep_screen_on(GLOBAL_DEF("display/window/keep_screen_on", true));
+	set_keep_screen_on(GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true));
 
 
 	return OK;
 	return OK;
 }
 }