From 317cb336eb548e6e202eca2e9b36455c01edfc33 Mon Sep 17 00:00:00 2001
From: volzhs
Date: Wed, 7 Feb 2018 06:32:03 +0900
Subject: Keep to show current script when closing all docs

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

Fix #16403

(cherry picked from commit df84290a7ee2e4e939fc4eccc030129227c83895)
---
 scene/gui/tab_container.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'scene/gui/tab_container.cpp')

diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp
index 0312e5809..6e85ce5eb 100644
--- a/scene/gui/tab_container.cpp
+++ b/scene/gui/tab_container.cpp
@@ -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")));
-- 
cgit v1.2.3-70-g09d2