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

Merge pull request #51252 from kleonc/tab_container-fix-disconnecting-errors-3x

Browse Source 
[3.x] TabContainer: Fix error on removing top-level Control child, Remove _get_tab method
This commit is contained in:
Rémi Verschelde 2021-08-16 10:35:45 +02:00 committed by GitHub
commit 7722eea613
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
scene/gui/tab_container.cpp
View File

@ -421,7 +421,7 @@ void TabContainer::_notification(int p_what) {
} }
void TabContainer::_draw_tab(Ref<StyleBox> &p_tab_style, Color &p_font_color, int p_index, float p_x) { void TabContainer::_draw_tab(Ref<StyleBox> &p_tab_style, Color &p_font_color, int p_index, float p_x) {
Vector<Control *> tabs = _get_tabs(); Control *control = get_tab_control(p_index);
RID canvas = get_canvas_item(); RID canvas = get_canvas_item();
Ref<Font> font = get_font("font"); Ref<Font> font = get_font("font");
int icon_text_distance = get_constant("hseparation"); int icon_text_distance = get_constant("hseparation");
@ -433,7 +433,6 @@ void TabContainer::_draw_tab(Ref<StyleBox> &p_tab_style, Color &p_font_color, in
p_tab_style->draw(canvas, tab_rect); p_tab_style->draw(canvas, tab_rect);
// Draw the tab contents. // Draw the tab contents.
Control *control = Object::cast_to<Control>(tabs[p_index]);
String text = control->has_meta("_tab_name") ? String(tr(String(control->get_meta("_tab_name")))) : String(tr(control->get_name())); String text = control->has_meta("_tab_name") ? String(tr(String(control->get_meta("_tab_name")))) : String(tr(control->get_name()));
int x_content = tab_rect.position.x + p_tab_style->get_margin(MARGIN_LEFT); int x_content = tab_rect.position.x + p_tab_style->get_margin(MARGIN_LEFT);
@ -475,10 +474,10 @@ void TabContainer::_repaint() {
if (tabs_visible) { if (tabs_visible) {
c->set_margin(MARGIN_TOP, _get_top_margin()); c->set_margin(MARGIN_TOP, _get_top_margin());
} }
c->set_margin(Margin(MARGIN_TOP), c->get_margin(Margin(MARGIN_TOP)) + sb->get_margin(Margin(MARGIN_TOP))); c->set_margin(MARGIN_TOP, c->get_margin(MARGIN_TOP) + sb->get_margin(MARGIN_TOP));
c->set_margin(Margin(MARGIN_LEFT), c->get_margin(Margin(MARGIN_LEFT)) + sb->get_margin(Margin(MARGIN_LEFT))); c->set_margin(MARGIN_LEFT, c->get_margin(MARGIN_LEFT) + sb->get_margin(MARGIN_LEFT));
c->set_margin(Margin(MARGIN_RIGHT), c->get_margin(Margin(MARGIN_RIGHT)) - sb->get_margin(Margin(MARGIN_RIGHT))); c->set_margin(MARGIN_RIGHT, c->get_margin(MARGIN_RIGHT) - sb->get_margin(MARGIN_RIGHT));
c->set_margin(Margin(MARGIN_BOTTOM), c->get_margin(Margin(MARGIN_BOTTOM)) - sb->get_margin(Margin(MARGIN_BOTTOM))); c->set_margin(MARGIN_BOTTOM, c->get_margin(MARGIN_BOTTOM) - sb->get_margin(MARGIN_BOTTOM));
} else { } else {
c->hide(); c->hide();
@ -536,7 +535,7 @@ Vector<Control *> TabContainer::_get_tabs() const {
Vector<Control *> controls; Vector<Control *> controls;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *control = Object::cast_to<Control>(get_child(i)); Control *control = Object::cast_to<Control>(get_child(i));
if (!control || control->is_toplevel_control()) { if (!control || control->is_set_as_toplevel()) {
continue; continue;
} }
@ -553,10 +552,7 @@ void TabContainer::add_child_notify(Node *p_child) {
Container::add_child_notify(p_child); Container::add_child_notify(p_child);
Control *c = Object::cast_to<Control>(p_child); Control *c = Object::cast_to<Control>(p_child);
if (!c) { if (!c || c->is_set_as_toplevel()) {
return;
}
if (c->is_set_as_toplevel()) {
return; return;
} }
@ -576,10 +572,10 @@ void TabContainer::add_child_notify(Node *p_child) {
c->set_margin(MARGIN_TOP, _get_top_margin()); c->set_margin(MARGIN_TOP, _get_top_margin());
} }
Ref<StyleBox> sb = get_stylebox("panel"); Ref<StyleBox> sb = get_stylebox("panel");
c->set_margin(Margin(MARGIN_TOP), c->get_margin(Margin(MARGIN_TOP)) + sb->get_margin(Margin(MARGIN_TOP))); c->set_margin(MARGIN_TOP, c->get_margin(MARGIN_TOP) + sb->get_margin(MARGIN_TOP));
c->set_margin(Margin(MARGIN_LEFT), c->get_margin(Margin(MARGIN_LEFT)) + sb->get_margin(Margin(MARGIN_LEFT))); c->set_margin(MARGIN_LEFT, c->get_margin(MARGIN_LEFT) + sb->get_margin(MARGIN_LEFT));
c->set_margin(Margin(MARGIN_RIGHT), c->get_margin(Margin(MARGIN_RIGHT)) - sb->get_margin(Margin(MARGIN_RIGHT))); c->set_margin(MARGIN_RIGHT, c->get_margin(MARGIN_RIGHT) - sb->get_margin(MARGIN_RIGHT));
c->set_margin(Margin(MARGIN_BOTTOM), c->get_margin(Margin(MARGIN_BOTTOM)) - sb->get_margin(Margin(MARGIN_BOTTOM))); c->set_margin(MARGIN_BOTTOM, c->get_margin(MARGIN_BOTTOM) - sb->get_margin(MARGIN_BOTTOM));
update(); update();
p_child->connect("renamed", this, "_child_renamed_callback"); p_child->connect("renamed", this, "_child_renamed_callback");
@ -588,6 +584,18 @@ void TabContainer::add_child_notify(Node *p_child) {
} }
} }
void TabContainer::move_child_notify(Node *p_child) {
Container::move_child_notify(p_child);
Control *c = Object::cast_to<Control>(p_child);
if (!c || c->is_set_as_toplevel()) {
return;
}
_update_current_tab();
update();
}
int TabContainer::get_tab_count() const { int TabContainer::get_tab_count() const {
return _get_tabs().size(); return _get_tabs().size();
} }
@ -631,21 +639,18 @@ Control *TabContainer::get_tab_control(int p_idx) const {
} }
Control *TabContainer::get_current_tab_control() const { Control *TabContainer::get_current_tab_control() const {
Vector<Control *> tabs = _get_tabs(); return get_tab_control(current);
if (current >= 0 && current < tabs.size()) {
return tabs[current];
} else {
return nullptr;
}
} }
void TabContainer::remove_child_notify(Node *p_child) { void TabContainer::remove_child_notify(Node *p_child) {
Container::remove_child_notify(p_child); Container::remove_child_notify(p_child);
if (!Object::cast_to<Control>(p_child)) { Control *c = Object::cast_to<Control>(p_child);
if (!c || c->is_set_as_toplevel()) {
return; return;
} }
// Defer the call because tab is not yet removed (remove_child_notify is called right before p_child is actually removed).
call_deferred("_update_current_tab"); call_deferred("_update_current_tab");
p_child->disconnect("renamed", this, "_child_renamed_callback"); p_child->disconnect("renamed", this, "_child_renamed_callback");
@ -856,19 +861,15 @@ bool TabContainer::is_all_tabs_in_front() const {
return all_tabs_in_front; return all_tabs_in_front;
} }
Control *TabContainer::_get_tab(int p_idx) const {
return get_tab_control(p_idx);
}
void TabContainer::set_tab_title(int p_tab, const String &p_title) { void TabContainer::set_tab_title(int p_tab, const String &p_title) {
Control *child = _get_tab(p_tab); Control *child = get_tab_control(p_tab);
ERR_FAIL_COND(!child); ERR_FAIL_COND(!child);
child->set_meta("_tab_name", p_title); child->set_meta("_tab_name", p_title);
update(); update();
} }
String TabContainer::get_tab_title(int p_tab) const { String TabContainer::get_tab_title(int p_tab) const {
Control *child = _get_tab(p_tab); Control *child = get_tab_control(p_tab);
ERR_FAIL_COND_V(!child, ""); ERR_FAIL_COND_V(!child, "");
if (child->has_meta("_tab_name")) { if (child->has_meta("_tab_name")) {
return child->get_meta("_tab_name"); return child->get_meta("_tab_name");
@ -878,13 +879,13 @@ String TabContainer::get_tab_title(int p_tab) const {
} }
void TabContainer::set_tab_icon(int p_tab, const Ref<Texture> &p_icon) { void TabContainer::set_tab_icon(int p_tab, const Ref<Texture> &p_icon) {
Control *child = _get_tab(p_tab); Control *child = get_tab_control(p_tab);
ERR_FAIL_COND(!child); ERR_FAIL_COND(!child);
child->set_meta("_tab_icon", p_icon); child->set_meta("_tab_icon", p_icon);
update(); update();
} }
Ref<Texture> TabContainer::get_tab_icon(int p_tab) const { Ref<Texture> TabContainer::get_tab_icon(int p_tab) const {
Control *child = _get_tab(p_tab); Control *child = get_tab_control(p_tab);
ERR_FAIL_COND_V(!child, Ref<Texture>()); ERR_FAIL_COND_V(!child, Ref<Texture>());
if (child->has_meta("_tab_icon")) { if (child->has_meta("_tab_icon")) {
return child->get_meta("_tab_icon"); return child->get_meta("_tab_icon");
@ -894,14 +895,14 @@ Ref<Texture> TabContainer::get_tab_icon(int p_tab) const {
} }
void TabContainer::set_tab_disabled(int p_tab, bool p_disabled) { void TabContainer::set_tab_disabled(int p_tab, bool p_disabled) {
Control *child = _get_tab(p_tab); Control *child = get_tab_control(p_tab);
ERR_FAIL_COND(!child); ERR_FAIL_COND(!child);
child->set_meta("_tab_disabled", p_disabled); child->set_meta("_tab_disabled", p_disabled);
update(); update();
} }
bool TabContainer::get_tab_disabled(int p_tab) const { bool TabContainer::get_tab_disabled(int p_tab) const {
Control *child = _get_tab(p_tab); Control *child = get_tab_control(p_tab);
ERR_FAIL_COND_V(!child, false); ERR_FAIL_COND_V(!child, false);
if (child->has_meta("_tab_disabled")) { if (child->has_meta("_tab_disabled")) {
return child->get_meta("_tab_disabled"); return child->get_meta("_tab_disabled");
@ -911,7 +912,7 @@ bool TabContainer::get_tab_disabled(int p_tab) const {
} }
void TabContainer::set_tab_hidden(int p_tab, bool p_hidden) { void TabContainer::set_tab_hidden(int p_tab, bool p_hidden) {
Control *child = _get_tab(p_tab); Control *child = get_tab_control(p_tab);
ERR_FAIL_COND(!child); ERR_FAIL_COND(!child);
child->set_meta("_tab_hidden", p_hidden); child->set_meta("_tab_hidden", p_hidden);
update(); update();
@ -930,7 +931,7 @@ void TabContainer::set_tab_hidden(int p_tab, bool p_hidden) {
} }
bool TabContainer::get_tab_hidden(int p_tab) const { bool TabContainer::get_tab_hidden(int p_tab) const {
Control *child = _get_tab(p_tab); Control *child = get_tab_control(p_tab);
ERR_FAIL_COND_V(!child, false); ERR_FAIL_COND_V(!child, false);
if (child->has_meta("_tab_hidden")) { if (child->has_meta("_tab_hidden")) {
return child->get_meta("_tab_hidden"); return child->get_meta("_tab_hidden");

2
scene/gui/tab_container.h
View File

@ -56,7 +56,6 @@ private:
bool menu_hovered; bool menu_hovered;
int highlight_arrow; int highlight_arrow;
TabAlign align; TabAlign align;
Control *_get_tab(int p_idx) const;
int _get_top_margin() const; int _get_top_margin() const;
mutable ObjectID popup_obj_id; mutable ObjectID popup_obj_id;
bool drag_to_rearrange_enabled; bool drag_to_rearrange_enabled;
@ -76,6 +75,7 @@ protected:
void _gui_input(const Ref<InputEvent> &p_event); void _gui_input(const Ref<InputEvent> &p_event);
void _notification(int p_what); void _notification(int p_what);
virtual void add_child_notify(Node *p_child); virtual void add_child_notify(Node *p_child);
virtual void move_child_notify(Node *p_child);
virtual void remove_child_notify(Node *p_child); virtual void remove_child_notify(Node *p_child);
Variant get_drag_data(const Point2 &p_point); Variant get_drag_data(const Point2 &p_point);