The initialization window matches the editor base color or splash background color #63819
Conversation
main/main.cpp
Outdated
| @@ -261,6 +262,27 @@ void finalize_navigation_server() { | |||
| navigation_server_2d = nullptr; | |||
| } | |||
|
|
|||
| // Take the configuration value before the editor initialization. | |||
There was a problem hiding this comment.
I would move this to a static function in EditorNode
|
Looks superb! Thanks for redoing it! |
|
Can this be implemented on platforms other than Windows? |
Window BG color can be set on macOS, but it's never visible. |
I work on Windows, and the publishing platform is also Windows. The white screen is also the most obviously on Windows.If this problem occurs then on other platforms, then this pr should serve as a helpful foundation. |
CodeLazier
force-pushed
the
master
branch
5 times, most recently
from
71dd520
to
bcc34d1
Compare
|
Godot's X11 platform doesn't initially display any color when creating a window, so I think it's fine to have this only for Windows for now. |
editor/editor_node.cpp
Outdated
| * This static method is used during the initialization phase of the initial window, | ||
| * care should be taken to detect whether each instance of the class is available. | ||
| */ | ||
| EditorPaths *p_editorPaths = EditorPaths::get_singleton(); |
There was a problem hiding this comment.
| EditorPaths *p_editorPaths = EditorPaths::get_singleton(); | |
| EditorPaths *editor_paths = EditorPaths::get_singleton(); |
We use p_ as prefix for function parameters, not for pointers. And we use snake case for identifiers.
editor/editor_node.cpp
Outdated
| // Default black(0,0,0,1) | ||
| Color result; |
There was a problem hiding this comment.
I wouldn't document what the default color is, if this ever changes it will make the comment obsolete.
Moreover, you never assign result so it's not relevant to define here, you can just do return Color(); in the fallback case.
main/main.cpp
Outdated
| #endif | ||
| /* Initialize Input */ | ||
|
|
There was a problem hiding this comment.
Keep a separation line between sections of code.
main/main.cpp
Outdated
| const Color boot_bg_color = | ||
| boot_bg_color = | ||
| GLOBAL_DEF_BASIC("application/boot_splash/bg_color", | ||
| (editor || project_manager) ? boot_splash_editor_bg_color : boot_splash_bg_color); | ||
| #else | ||
| const Color boot_bg_color = GLOBAL_DEF_BASIC("application/boot_splash/bg_color", boot_splash_bg_color); | ||
| boot_bg_color = GLOBAL_DEF_BASIC("application/boot_splash/bg_color", boot_splash_bg_color); |
There was a problem hiding this comment.
You duplicated this code earlier, is this still needed?
main/main.cpp
Outdated
| // Godot Default background color. | ||
| Color init_bg_color = Color(0.21f, 0.24f, 0.29f); |
There was a problem hiding this comment.
I'm not too fond of hardcoding this, this is bound to get out of sync if we ever change the default background color.
There was a problem hiding this comment.
Overall I'm not too fond of these changes personally, I find this adds significantly complexity to the setup for what seems to be a fairly niche need on Windows only. Having to parse editor config before the editor settings have been initialized just to retrieve a configurable theme option seems hacky.
For the running project, we have boot_bg_color, isn't that sufficient?
Wouldn't it be simpler to just hardcode a black color in the Windows window creation instead of doing all this? Or just delay showing the window until it has something to render?
Either of these approaches sound good to me. A black flash is way less problematic than a white flash in a dark environment. |
If feel that too many changes will not bring benefits, then you can see #53806 , only one line of code has been added. |
|
I really apologize that this this idea only comes up now, but would it not be simpler to just define |
|
sorry,there may not be much time recently. I modified as suggested and found that if you put the get/set color code into display_server_windows.cpp, it will cause some problems. First, you cannot use the default definition of boot_splash_bg_color, and secondly if you want to use the default color defined by the editor theme, then To introduce editor_node.h, my local test will compile errors. If peek_cfg_theme_color() is implemented in display_server_windows.cpp, it will introduce other .h files more than necessary, causing pollution. Therefore, various preset colors must be obtained in main.cpp In this case, the parameters of the virtual function are still added. So it is of little significance. Unless the editor theme bgcolor is no longer obtained, but the effect may be abrupt in the editor (especially the splash bgcolor with high contrast is set and editor theme). Maybe give me some tips, otherwise it might take some time to see if there is a better solution. |
|
Superseded by #71289. |
This pr is a graft for #53922, due to the fact that #53922 has a lot of conflicts for a long time, and the code is modified as required. pr has been manually corrected to can be merged correctly.
Bugsquad edit: This closes #58056.