asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #90415 from YeldhamDev/yet_another_meta_added

Browse source 
Fix `TabContainer` desync when tabs share names
This commit is contained in:
Rémi Verschelde 2024-04-09 10:42:42 +02:00
commit a445f6bf69
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
scene/gui/tab_container.cpp
View file

@ -500,6 +500,13 @@ void TabContainer::_on_tab_visibility_changed(Control *p_child) {
updating_visibility = false; updating_visibility = false;
} }
void TabContainer::_refresh_tab_indices() {
Vector<Control *> controls = _get_tab_controls();
for (int i = 0; i < controls.size(); i++) {
controls[i]->set_meta("_tab_index", i);
}
}
void TabContainer::_refresh_tab_names() { void TabContainer::_refresh_tab_names() {
Vector<Control *> controls = _get_tab_controls(); Vector<Control *> controls = _get_tab_controls();
for (int i = 0; i < controls.size(); i++) { for (int i = 0; i < controls.size(); i++) {
@ -523,6 +530,7 @@ void TabContainer::add_child_notify(Node *p_child) {
c->hide(); c->hide();
tab_bar->add_tab(p_child->get_name()); tab_bar->add_tab(p_child->get_name());
c->set_meta("_tab_index", tab_bar->get_tab_count() - 1);
_update_margins(); _update_margins();
if (get_tab_count() == 1) { if (get_tab_count() == 1) {
@ -547,19 +555,10 @@ void TabContainer::move_child_notify(Node *p_child) {
Control *c = Object::cast_to<Control>(p_child); Control *c = Object::cast_to<Control>(p_child);
if (c && !c->is_set_as_top_level()) { if (c && !c->is_set_as_top_level()) {
int old_idx = -1; tab_bar->move_tab(c->get_meta("_tab_index"), get_tab_idx_from_control(c));
String tab_name = String(c->get_meta("_tab_name", c->get_name()));
// Find the previous tab index of the control.
for (int i = 0; i < get_tab_count(); i++) {
if (get_tab_title(i) == tab_name) {
old_idx = i;
break;
}
}
tab_bar->move_tab(old_idx, get_tab_idx_from_control(c));
} }
_refresh_tab_indices();
} }
void TabContainer::remove_child_notify(Node *p_child) { void TabContainer::remove_child_notify(Node *p_child) {
@ -578,7 +577,10 @@ void TabContainer::remove_child_notify(Node *p_child) {
// As the child hasn't been removed yet, keep track of it so when the "tab_changed" signal is fired it can be ignored. // As the child hasn't been removed yet, keep track of it so when the "tab_changed" signal is fired it can be ignored.
children_removing.push_back(c); children_removing.push_back(c);
tab_bar->remove_tab(idx); tab_bar->remove_tab(idx);
_refresh_tab_indices();
children_removing.erase(c); children_removing.erase(c);
_update_margins(); _update_margins();
@ -586,6 +588,7 @@ void TabContainer::remove_child_notify(Node *p_child) {
queue_redraw(); queue_redraw();
} }
p_child->remove_meta("_tab_index");
p_child->remove_meta("_tab_name"); p_child->remove_meta("_tab_name");
p_child->disconnect("renamed", callable_mp(this, &TabContainer::_refresh_tab_names)); p_child->disconnect("renamed", callable_mp(this, &TabContainer::_refresh_tab_names));
p_child->disconnect(SNAME("visibility_changed"), callable_mp(this, &TabContainer::_on_tab_visibility_changed)); p_child->disconnect(SNAME("visibility_changed"), callable_mp(this, &TabContainer::_on_tab_visibility_changed));

1
scene/gui/tab_container.h
View file

@ -101,6 +101,7 @@ private:
Vector<Control *> _get_tab_controls() const; Vector<Control *> _get_tab_controls() const;
void _on_theme_changed(); void _on_theme_changed();
void _repaint(); void _repaint();
void _refresh_tab_indices();
void _refresh_tab_names(); void _refresh_tab_names();
void _update_margins(); void _update_margins();
void _on_mouse_exited(); void _on_mouse_exited();