godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91081 from KoBeWi/closing_faster_than_light 

Further speed up closing multiple scripts
This commit is contained in:
Rémi Verschelde 2024-04-24 09:59:56 +02:00
parent ba3007d127 fd3ed998ce
commit a4fbe4c01f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
editor/plugins/script_editor_plugin.cpp
View File

@ -863,19 +863,20 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save, bool p_history_back) {
_save_editor_state(current);
}
memdelete(tselected);
if (idx >= tab_container->get_tab_count()) {
idx = tab_container->get_tab_count() - 1;
}
if (idx >= 0) {
if (history_pos >= 0) {
idx = tab_container->get_tab_idx_from_control(history[history_pos].control);
}
_go_to_tab(idx);
} else {
_update_selected_editor_menu();
}
if (script_close_queue.is_empty()) {
if (idx >= tab_container->get_tab_count()) {
idx = tab_container->get_tab_count() - 1;
}
if (idx >= 0) {
if (history_pos >= 0) {
idx = tab_container->get_tab_idx_from_control(history[history_pos].control);
}
_go_to_tab(idx);
} else {
_update_selected_editor_menu();
}
_update_history_arrows();
_update_script_names();
_save_layout();
@ -883,8 +884,8 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save, bool p_history_back) {
}
}
void ScriptEditor::_close_current_tab(bool p_save) {
_close_tab(tab_container->get_current_tab(), p_save);
void ScriptEditor::_close_current_tab(bool p_save, bool p_history_back) {
_close_tab(tab_container->get_current_tab(), p_save, p_history_back);
}
void ScriptEditor::_close_discard_current_tab(const String &p_str) {
@ -948,7 +949,7 @@ void ScriptEditor::_queue_close_tabs() {
}
}
_close_current_tab(false);
_close_current_tab(false, false);
}
_update_find_replace_bar();
}
@ -4153,7 +4154,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
erase_tab_confirm = memnew(ConfirmationDialog);
erase_tab_confirm->set_ok_button_text(TTR("Save"));
erase_tab_confirm->add_button(TTR("Discard"), DisplayServer::get_singleton()->get_swap_cancel_ok(), "discard");
erase_tab_confirm->connect("confirmed", callable_mp(this, &ScriptEditor::_close_current_tab).bind(true));
erase_tab_confirm->connect("confirmed", callable_mp(this, &ScriptEditor::_close_current_tab).bind(true, true));
erase_tab_confirm->connect("custom_action", callable_mp(this, &ScriptEditor::_close_discard_current_tab));
add_child(erase_tab_confirm);

2
editor/plugins/script_editor_plugin.h
View File

@ -374,7 +374,7 @@ class ScriptEditor : public PanelContainer {
void _close_tab(int p_idx, bool p_save = true, bool p_history_back = true);
void _update_find_replace_bar();
void _close_current_tab(bool p_save = true);
void _close_current_tab(bool p_save = true, bool p_history_back = true);
void _close_discard_current_tab(const String &p_str);
void _close_docs_tab();
void _close_other_tabs();