From c47ac206207e4be5d4694d3e2796583069a79a64 Mon Sep 17 00:00:00 2001 From: Rindbee Date: Mon, 18 Jul 2022 19:56:23 +0800 Subject: Fix getting outdated tab controls --- scene/gui/tab_container.cpp | 9 +++++++-- scene/gui/tab_container.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp index fa929344d4..08db07c425 100644 --- a/scene/gui/tab_container.cpp +++ b/scene/gui/tab_container.cpp @@ -312,7 +312,7 @@ Vector TabContainer::_get_tab_controls() const { Vector controls; for (int i = 0; i < get_child_count(); i++) { Control *control = Object::cast_to(get_child(i)); - if (!control || control->is_set_as_top_level() || control == tab_bar) { + if (!control || control->is_set_as_top_level() || control == tab_bar || control == child_removing) { continue; } @@ -549,7 +549,12 @@ void TabContainer::remove_child_notify(Node *p_child) { return; } - tab_bar->remove_tab(get_tab_idx_from_control(c)); + int idx = get_tab_idx_from_control(c); + + // Before this, the tab control has not changed; after this, the tab control has changed. + child_removing = p_child; + tab_bar->remove_tab(idx); + child_removing = nullptr; _update_margins(); if (get_tab_count() == 0) { diff --git a/scene/gui/tab_container.h b/scene/gui/tab_container.h index 9adaa0d844..60c8130939 100644 --- a/scene/gui/tab_container.h +++ b/scene/gui/tab_container.h @@ -46,6 +46,7 @@ class TabContainer : public Container { bool drag_to_rearrange_enabled = false; bool use_hidden_tabs_for_min_size = false; bool theme_changing = false; + Node *child_removing = nullptr; int _get_top_margin() const; Vector _get_tab_controls() const; -- cgit v1.2.3