hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Keep to show current script when closing all docs

Browse source 
also fix error when removing multiple tabs from TabContainer at same frame.
like closing multiple docs at once.

Fix #16403
This commit is contained in:
volzhs 2018-02-07 06:32:03 +09:00
parent fee29570d0
commit df84290a7e
4 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
scene/gui/tab_container.cpp
View file

@ -474,21 +474,24 @@ void TabContainer::remove_child_notify(Node *p_child) {
Control::remove_child_notify(p_child);
int tc = get_tab_count();
if (current == tc - 1) {
current--;
if (current < 0)
current = 0;
else {
call_deferred("set_current_tab", current);
}
}
call_deferred("_update_current_tab");
p_child->disconnect("renamed", this, "_child_renamed_callback");
update();
}
void TabContainer::_update_current_tab() {
int tc = get_tab_count();
if (current >= tc)
current = tc - 1;
if (current < 0)
current = 0;
else
set_current_tab(current);
}
void TabContainer::set_tab_align(TabAlign p_align) {
ERR_FAIL_INDEX(p_align, 3);
@ -664,6 +667,7 @@ void TabContainer::_bind_methods() {
ClassDB::bind_method(D_METHOD("_child_renamed_callback"), &TabContainer::_child_renamed_callback);
ClassDB::bind_method(D_METHOD("_on_theme_changed"), &TabContainer::_on_theme_changed);
ClassDB::bind_method(D_METHOD("_update_current_tab"), &TabContainer::_update_current_tab);
ADD_SIGNAL(MethodInfo("tab_changed", PropertyInfo(Variant::INT, "tab")));
ADD_SIGNAL(MethodInfo("tab_selected", PropertyInfo(Variant::INT, "tab")));