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

Merge pull request #56206 from KoBeWi/random_call_deferred_to_the_rescue_once_again

Browse Source
This commit is contained in:
Rémi Verschelde 2022-01-05 10:57:53 +01:00 committed by GitHub
commit 8eb1d20346
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scene/gui/tab_container.cpp
View File

@ -703,30 +703,16 @@ void TabContainer::add_child_notify(Node *p_child) {
return; return;
} }
Vector<Control *> tabs = _get_tabs();
_refresh_texts(); _refresh_texts();
call_deferred("_repaint");
update();
bool first = false; bool first = (_get_tabs().size() == 1);
if (first) {
if (tabs.size() != 1) {
c->hide();
} else {
c->show();
//call_deferred(SNAME("set_current_tab"),0);
first = true;
current = 0; current = 0;
previous = 0; previous = 0;
} }
c->set_anchors_and_offsets_preset(Control::PRESET_WIDE);
if (tabs_visible) {
c->set_offset(SIDE_TOP, _get_top_margin());
}
Ref<StyleBox> sb = get_theme_stylebox(SNAME("panel"));
c->set_offset(SIDE_TOP, c->get_offset(SIDE_TOP) + sb->get_margin(SIDE_TOP));
c->set_offset(SIDE_LEFT, c->get_offset(SIDE_LEFT) + sb->get_margin(SIDE_LEFT));
c->set_offset(SIDE_RIGHT, c->get_offset(SIDE_RIGHT) - sb->get_margin(SIDE_RIGHT));
c->set_offset(SIDE_BOTTOM, c->get_offset(SIDE_BOTTOM) - sb->get_margin(SIDE_BOTTOM));
update();
p_child->connect("renamed", callable_mp(this, &TabContainer::_child_renamed_callback)); p_child->connect("renamed", callable_mp(this, &TabContainer::_child_renamed_callback));
if (first && is_inside_tree()) { if (first && is_inside_tree()) {
emit_signal(SNAME("tab_changed"), current); emit_signal(SNAME("tab_changed"), current);
@ -1223,6 +1209,7 @@ void TabContainer::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_use_hidden_tabs_for_min_size", "enabled"), &TabContainer::set_use_hidden_tabs_for_min_size); ClassDB::bind_method(D_METHOD("set_use_hidden_tabs_for_min_size", "enabled"), &TabContainer::set_use_hidden_tabs_for_min_size);
ClassDB::bind_method(D_METHOD("get_use_hidden_tabs_for_min_size"), &TabContainer::get_use_hidden_tabs_for_min_size); ClassDB::bind_method(D_METHOD("get_use_hidden_tabs_for_min_size"), &TabContainer::get_use_hidden_tabs_for_min_size);
ClassDB::bind_method(D_METHOD("_repaint"), &TabContainer::_repaint);
ClassDB::bind_method(D_METHOD("_on_theme_changed"), &TabContainer::_on_theme_changed); ClassDB::bind_method(D_METHOD("_on_theme_changed"), &TabContainer::_on_theme_changed);
ClassDB::bind_method(D_METHOD("_update_current_tab"), &TabContainer::_update_current_tab); ClassDB::bind_method(D_METHOD("_update_current_tab"), &TabContainer::_update_current_tab);