Skip to content

Commit

Permalink
Restore default clear color after displaying boot splash
Browse files Browse the repository at this point in the history
On Android the boot splash can be shown at a different time, so the clear color restore needs to happen within the `setup_boot_logo` function
  • Loading branch information
clayjohn committed Jul 15, 2024
1 parent 97b8ad1 commit 999c7e0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2917,8 +2917,6 @@ Error Main::setup2(bool p_show_boot_logo) {
MAIN_PRINT("Main: Clear Color");

DisplayServer::set_early_window_clear_color_override(false);
RenderingServer::get_singleton()->set_default_clear_color(
GLOBAL_GET("rendering/environment/defaults/default_clear_color"));

GLOBAL_DEF_BASIC(PropertyInfo(Variant::STRING, "application/config/icon", PROPERTY_HINT_FILE, "*.png,*.webp,*.svg"), String());
GLOBAL_DEF(PropertyInfo(Variant::STRING, "application/config/macos_native_icon", PROPERTY_HINT_FILE, "*.icns"), String());
Expand Down Expand Up @@ -3219,6 +3217,8 @@ void Main::setup_boot_logo() {
}
#endif
}
RenderingServer::get_singleton()->set_default_clear_color(
GLOBAL_GET("rendering/environment/defaults/default_clear_color"));
}

String Main::get_rendering_driver_name() {
Expand Down

0 comments on commit 999c7e0

Please sign in to comment.