Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-31 22:21:52 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Defer the call to 'popup_str' to the next cycle to let Godot Engine's editor time to properly start

Browse Source
This commit is contained in:
Xavier Sellier 2021-12-14 13:42:46 +01:00
parent 15aea89868
commit ba0abd399f
No known key found for this signature in database
GPG Key ID: 61235A4D1A13B336
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/error/error_macros.cpp
View File

@ -37,9 +37,16 @@
static ErrorHandlerList *error_handler_list = nullptr;
void add_error_handler(ErrorHandlerList *p_handler) {
// If p_handler is already in error_handler_list
// we'd better remove it first then we can add it.
// This prevent cyclic redundancy.
remove_error_handler(p_handler);
_global_lock();
p_handler->next = error_handler_list;
error_handler_list = p_handler;
_global_unlock();
}

17
editor/editor_toaster.cpp
View File

@ -173,11 +173,7 @@ void EditorToaster::_error_handler(void *p_self, const char *p_func, const char
}
Severity severity = (p_type == ERR_HANDLER_WARNING) ? SEVERITY_WARNING : SEVERITY_ERROR;
if (Thread::get_caller_id() != Thread::get_main_id()) {
EditorToaster::get_singleton()->call_deferred(SNAME("popup_str"), err_str, severity, tooltip_str);
} else {
EditorToaster::get_singleton()->popup_str(err_str, severity, tooltip_str);
}
EditorToaster::get_singleton()->popup_str(err_str, severity, tooltip_str);
}
}
@ -387,6 +383,12 @@ Control *EditorToaster::popup(Control *p_control, Severity p_severity, double p_
}
void EditorToaster::popup_str(String p_message, Severity p_severity, String p_tooltip) {
// Since "_popup_str" adds nodes to the tree, and since the "add_child" method is not
// thread-safe, it's better to defer the call to the next cycle to be thread-safe.
call_deferred(SNAME("_popup_str"), p_message, p_severity, p_tooltip);
}
void EditorToaster::_popup_str(String p_message, Severity p_severity, String p_tooltip) {
// Check if we already have a popup with the given message.
Control *control = nullptr;
for (KeyValue<Control *, Toast> element : toasts) {
@ -440,6 +442,11 @@ EditorToaster *EditorToaster::get_singleton() {
return singleton;
}
void EditorToaster::_bind_methods() {
// Binding method to make it defer-able.
ClassDB::bind_method(D_METHOD("_popup_str", "message", "severity", "tooltip"), &EditorToaster::_popup_str);
}
EditorToaster::EditorToaster() {
set_notify_transform(true);
set_process_internal(true);

2
editor/editor_toaster.h
View File

@ -94,9 +94,11 @@ private:
void _set_notifications_enabled(bool p_enabled);
void _repop_old();
void _popup_str(String p_message, Severity p_severity, String p_tooltip);
protected:
static EditorToaster *singleton;
static void _bind_methods();
void _notification(int p_what);