diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-08 12:04:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-08 12:04:04 +0200 |
| commit | 5df8eae86292303fefe2d412fb8c04126e7ebe87 (patch) | |
| tree | 7882e72df128ae9bbe8ea4bf88f74863619ff1b2 /platform | |
| parent | 76391a091ed69f02ebdcc94164bac9d917c21606 (diff) | |
| parent | c939f336d6e26bb0d84f23e5a2587bc296b35dbf (diff) | |
Merge pull request #64014 from RedMser/keep-screen-on-singledef
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/ios/display_server_ios.mm | 2 | ||||
| -rw-r--r-- | platform/linuxbsd/display_server_x11.cpp | 2 | ||||
| -rw-r--r-- | platform/macos/display_server_macos.mm | 2 | ||||
| -rw-r--r-- | platform/uwp/os_uwp.cpp | 2 | ||||
| -rw-r--r-- | platform/windows/display_server_windows.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/platform/ios/display_server_ios.mm b/platform/ios/display_server_ios.mm index 080ee5f3ab..6ce7e676a2 100644 --- a/platform/ios/display_server_ios.mm +++ b/platform/ios/display_server_ios.mm @@ -128,7 +128,7 @@ DisplayServerIOS::DisplayServerIOS(const String &p_rendering_driver, WindowMode } #endif - bool keep_screen_on = bool(GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true)); + bool keep_screen_on = bool(GLOBAL_GET("display/window/energy_saving/keep_screen_on")); screen_set_keep_on(keep_screen_on); Input::get_singleton()->set_event_dispatch_function(_dispatch_input_events); diff --git a/platform/linuxbsd/display_server_x11.cpp b/platform/linuxbsd/display_server_x11.cpp index 3409e43ba5..8efbd2e3c5 100644 --- a/platform/linuxbsd/display_server_x11.cpp +++ b/platform/linuxbsd/display_server_x11.cpp @@ -4991,7 +4991,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode #ifdef DBUS_ENABLED screensaver = memnew(FreeDesktopScreenSaver); - screen_set_keep_on(GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true)); + screen_set_keep_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on")); #endif r_error = OK; diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index e228007246..a49485154b 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -3286,7 +3286,7 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowM } #endif - screen_set_keep_on(GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true)); + screen_set_keep_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on")); } DisplayServerMacOS::~DisplayServerMacOS() { diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp index 7bc4c6047c..40f93bb18b 100644 --- a/platform/uwp/os_uwp.cpp +++ b/platform/uwp/os_uwp.cpp @@ -275,7 +275,7 @@ Error OS_UWP::initialize(const VideoMode &p_desired, int p_video_driver, int p_a display_request->RequestActive(); } - set_keep_screen_on(GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true)); + set_keep_screen_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on")); return OK; } diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index a975d09a9d..8c8dbef8a4 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -3653,7 +3653,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win tts = memnew(TTS_Windows); // Enforce default keep screen on value. - screen_set_keep_on(GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true)); + screen_set_keep_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on")); // Note: Wacom WinTab driver API for pen input, for devices incompatible with Windows Ink. HMODULE wintab_lib = LoadLibraryW(L"wintab32.dll"); |