Only define keep_screen_on project setting once
#64014
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
akien-mga
reviewed
Aug 6, 2022
| @@ -1481,7 +1481,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph | |||
| OS::get_singleton()->_allow_layered = false; | |||
| } | |||
|
|
|||
| OS::get_singleton()->_keep_screen_on = GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true); | |||
There was a problem hiding this comment.
Actually this might change behavior. I don't see the Android implementation querying the setting so it might break now.
I also wonder why it needs to be done manually in each platform instead of just done in main.cpp after the DisplaySerer is instantiated?
There was a problem hiding this comment.
I don't see the Android implementation querying the setting
Isn't this the android implementation? I also couldn't find any uses for the OS singleton's variable.
why it needs to be done manually in each platform
I'm not sure, maybe it was done this way since not all platforms implement the function? I could try changing how it's being called, but can't really test it for all platforms.
There was a problem hiding this comment.
I don't see the Android implementation querying the setting
Isn't this the android implementation? I also couldn't find any uses for the OS singleton's variable.
Ah indeed.
Ah I was going to suggest making OS::_keep_screen_on private but it seems like it's already the case, this was just abusing the fact that OS is a friend class to Main.
akien-mga
approved these changes
Aug 8, 2022
|
Thanks! |
reduz
added a commit
to reduz/godot
that referenced
this pull request
Jan 13, 2023
* Overrides no longer happen for set/get. * They must be checked with a new function: `ProjectSettings::get_setting_with_override()`. * GLOBAL_DEF/GLOBAL_GET updated to use this This change solves many problems: * General confusion about getting the actual or overriden setting. * Feature tags available after settings are loaded were being ignored, they are now considered. * Hacks required for the Project Settings editor to work. Fixes godotengine#64100. Fixes godotengine#64014. Fixes godotengine#61908.
reduz
added a commit
to reduz/godot
that referenced
this pull request
Jan 13, 2023
* Overrides no longer happen for set/get. * They must be checked with a new function: `ProjectSettings::get_setting_with_override()`. * GLOBAL_DEF/GLOBAL_GET updated to use this This change solves many problems: * General confusion about getting the actual or overriden setting. * Feature tags available after settings are loaded were being ignored, they are now considered. * Hacks required for the Project Settings editor to work. Fixes godotengine#64100. Fixes godotengine#64014. Fixes godotengine#61908.
reduz
added a commit
to reduz/godot
that referenced
this pull request
Jan 13, 2023
* Overrides no longer happen for set/get. * They must be checked with a new function: `ProjectSettings::get_setting_with_override()`. * GLOBAL_DEF/GLOBAL_GET updated to use this This change solves many problems: * General confusion about getting the actual or overriden setting. * Feature tags available after settings are loaded were being ignored, they are now considered. * Hacks required for the Project Settings editor to work. Fixes godotengine#64100. Fixes godotengine#64014. Fixes godotengine#61908.
reduz
added a commit
to reduz/godot
that referenced
this pull request
Jan 13, 2023
* Overrides no longer happen for set/get. * They must be checked with a new function: `ProjectSettings::get_setting_with_override()`. * GLOBAL_DEF/GLOBAL_GET updated to use this This change solves many problems: * General confusion about getting the actual or overriden setting. * Feature tags available after settings are loaded were being ignored, they are now considered. * Hacks required for the Project Settings editor to work. Fixes godotengine#64100. Fixes godotengine#64014. Fixes godotengine#61908.
reduz
added a commit
to reduz/godot
that referenced
this pull request
Jan 13, 2023
* Overrides no longer happen for set/get. * They must be checked with a new function: `ProjectSettings::get_setting_with_override()`. * GLOBAL_DEF/GLOBAL_GET updated to use this This change solves many problems: * General confusion about getting the actual or overriden setting. * Feature tags available after settings are loaded were being ignored, they are now considered. * Hacks required for the Project Settings editor to work. Fixes godotengine#64100. Fixes godotengine#64014. Fixes godotengine#61908.
reduz
added a commit
to reduz/godot
that referenced
this pull request
Jan 13, 2023
* Overrides no longer happen for set/get. * They must be checked with a new function: `ProjectSettings::get_setting_with_override()`. * GLOBAL_DEF/GLOBAL_GET updated to use this This change solves many problems: * General confusion about getting the actual or overriden setting. * Feature tags available after settings are loaded were being ignored, they are now considered. * Hacks required for the Project Settings editor to work. Fixes godotengine#64100. Fixes godotengine#64014. Fixes godotengine#61908.
Streq
pushed a commit
to Streq/godot
that referenced
this pull request
Feb 9, 2023
* Overrides no longer happen for set/get. * They must be checked with a new function: `ProjectSettings::get_setting_with_override()`. * GLOBAL_DEF/GLOBAL_GET updated to use this This change solves many problems: * General confusion about getting the actual or overriden setting. * Feature tags available after settings are loaded were being ignored, they are now considered. * Hacks required for the Project Settings editor to work. Fixes godotengine#64100. Fixes godotengine#64014. Fixes godotengine#61908.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Discussed in #63882
The
.editorfeature override does not currently work, since overrides are disabled in the editor it seems.