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

Fix debugger icon for warnings

Browse Source
This commit is contained in:
Chaosus
2018-08-16 08:41:03 +03:00
parent 1c17c2b9b3
commit 4fdb8ebdec
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
editor/script_editor_debugger.cpp
View File

@@ -734,7 +734,10 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
error_list->set_item_metadata(error_list->get_item_count() - 1, stack); error_list->set_item_metadata(error_list->get_item_count() - 1, stack);
error_count++; if (warning)
warning_count++;
else
error_count++;
} else if (p_msg == "profile_sig") { } else if (p_msg == "profile_sig") {
//cache a signature //cache a signature
@@ -1011,20 +1014,26 @@ void ScriptEditorDebugger::_notification(int p_what) {
} }
} }
if (error_count != last_error_count) { if (error_count != last_error_count || warning_count != last_warning_count) {
if (error_count == 0) { if (error_count == 0 && warning_count == 0) {
error_split->set_name(TTR("Errors")); error_split->set_name(TTR("Errors"));
debugger_button->set_text(TTR("Debugger")); debugger_button->set_text(TTR("Debugger"));
debugger_button->set_icon(Ref<Texture>()); debugger_button->set_icon(Ref<Texture>());
tabs->set_tab_icon(error_split->get_index(), Ref<Texture>()); tabs->set_tab_icon(error_split->get_index(), Ref<Texture>());
} else { } else {
error_split->set_name(TTR("Errors") + " (" + itos(error_count) + ")"); error_split->set_name(TTR("Errors") + " (" + itos(error_count + warning_count) + ")");
debugger_button->set_text(TTR("Debugger") + " (" + itos(error_count) + ")"); debugger_button->set_text(TTR("Debugger") + " (" + itos(error_count + warning_count) + ")");
debugger_button->set_icon(get_icon("Error", "EditorIcons")); if (error_count == 0) {
tabs->set_tab_icon(error_split->get_index(), get_icon("Error", "EditorIcons")); debugger_button->set_icon(get_icon("Warning", "EditorIcons"));
tabs->set_tab_icon(error_split->get_index(), get_icon("Warning", "EditorIcons"));
} else {
debugger_button->set_icon(get_icon("Error", "EditorIcons"));
tabs->set_tab_icon(error_split->get_index(), get_icon("Error", "EditorIcons"));
}
} }
last_error_count = error_count; last_error_count = error_count;
last_warning_count = warning_count;
} }
if (connection.is_null()) { if (connection.is_null()) {
@@ -1054,6 +1063,7 @@ void ScriptEditorDebugger::_notification(int p_what) {
error_list->clear(); error_list->clear();
error_stack->clear(); error_stack->clear();
error_count = 0; error_count = 0;
warning_count = 0;
profiler_signature.clear(); profiler_signature.clear();
//live_edit_root->set_text("/root"); //live_edit_root->set_text("/root");
@@ -1750,6 +1760,7 @@ void ScriptEditorDebugger::_clear_errors_list() {
error_list->clear(); error_list->clear();
error_count = 0; error_count = 0;
warning_count = 0;
_notification(NOTIFICATION_PROCESS); _notification(NOTIFICATION_PROCESS);
} }
@@ -2162,9 +2173,11 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) {
live_debug = false; live_debug = false;
last_path_id = false; last_path_id = false;
error_count = 0; error_count = 0;
warning_count = 0;
hide_on_stop = true; hide_on_stop = true;
enable_external_editor = false; enable_external_editor = false;
last_error_count = 0; last_error_count = 0;
last_warning_count = 0;
EditorNode::get_singleton()->get_pause_button()->connect("pressed", this, "_paused"); EditorNode::get_singleton()->get_pause_button()->connect("pressed", this, "_paused");
} }

2
editor/script_editor_debugger.h
View File

@@ -96,7 +96,9 @@ class ScriptEditorDebugger : public Control {
EditorFileDialog *file_dialog; EditorFileDialog *file_dialog;
int error_count; int error_count;
int warning_count;
int last_error_count; int last_error_count;
int last_warning_count;
bool hide_on_stop; bool hide_on_stop;
bool enable_external_editor; bool enable_external_editor;