godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Fix Editor wayland first scan task error.

Browse Source 
Co-authored-by: Tomasz Chabora <kobewi4e@gmail.com>
This commit is contained in:
Mounir Tohami
2025-07-25 01:05:15 +03:00
parent 006e3f26b9
commit 1cc459d86f
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_node.cpp
View File

@@ -851,7 +851,7 @@ void EditorNode::_notification(int p_what) {
command_palette->register_shortcuts_as_command(); command_palette->register_shortcuts_as_command();
callable_mp(this, &EditorNode::_begin_first_scan).call_deferred(); _begin_first_scan();
last_dark_mode_state = DisplayServer::get_singleton()->is_dark_mode(); last_dark_mode_state = DisplayServer::get_singleton()->is_dark_mode();
last_system_accent_color = DisplayServer::get_singleton()->get_accent_color(); last_system_accent_color = DisplayServer::get_singleton()->get_accent_color();

8
editor/gui/progress_dialog.cpp
View File

@@ -166,6 +166,14 @@ void ProgressDialog::_popup() {
center_panel->set_custom_minimum_size(ms); center_panel->set_custom_minimum_size(ms);
if (is_ready()) {
_reparent_and_show();
} else {
callable_mp(this, &ProgressDialog::_reparent_and_show).call_deferred();
}
}
void ProgressDialog::_reparent_and_show() {
Window *current_window = SceneTree::get_singleton()->get_root()->get_last_exclusive_window(); Window *current_window = SceneTree::get_singleton()->get_root()->get_last_exclusive_window();
ERR_FAIL_NULL(current_window); ERR_FAIL_NULL(current_window);
reparent(current_window); reparent(current_window);

1
editor/gui/progress_dialog.h
View File

@@ -89,6 +89,7 @@ class ProgressDialog : public CenterContainer {
void _cancel_pressed(); void _cancel_pressed();
void _update_ui(); void _update_ui();
void _reparent_and_show();
bool canceled = false; bool canceled = false;
protected: protected: