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

Merge pull request #39806 from RandomShaper/fix_gone_popup_crash_3.2 

Handle gone TabContainer popup nicely (3.2)
This commit is contained in:
Rémi Verschelde 2020-06-24 20:22:14 +02:00 committed by GitHub
parent 1575820207 0f0360702b
commit 8b210f8732
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scene/gui/tab_container.cpp
View File

@ -71,6 +71,8 @@ void TabContainer::_gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseButton> mb = p_event; Ref<InputEventMouseButton> mb = p_event;
Popup *popup = get_popup();
if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
Point2 pos(mb->get_position().x, mb->get_position().y); Point2 pos(mb->get_position().x, mb->get_position().y);
@ -231,6 +233,7 @@ void TabContainer::_notification(int p_what) {
int header_width = get_size().width - side_margin * 2; int header_width = get_size().width - side_margin * 2;
// Find the width of the header area. // Find the width of the header area.
Popup *popup = get_popup();
if (popup) if (popup)
header_width -= menu->get_width(); header_width -= menu->get_width();
if (buttons_visible_cache) if (buttons_visible_cache)
@ -289,6 +292,7 @@ void TabContainer::_notification(int p_what) {
int header_x = side_margin; int header_x = side_margin;
int header_width = size.width - side_margin * 2; int header_width = size.width - side_margin * 2;
int header_height = _get_top_margin(); int header_height = _get_top_margin();
Popup *popup = get_popup();
if (popup) if (popup)
header_width -= menu->get_width(); header_width -= menu->get_width();
@ -750,6 +754,7 @@ int TabContainer::get_tab_idx_at_point(const Point2 &p_point) const {
Size2 size = get_size(); Size2 size = get_size();
int right_ofs = 0; int right_ofs = 0;
Popup *popup = get_popup();
if (popup) { if (popup) {
Ref<Texture> menu = get_icon("menu"); Ref<Texture> menu = get_icon("menu");
right_ofs += menu->get_width(); right_ofs += menu->get_width();
@ -957,12 +962,24 @@ Size2 TabContainer::get_minimum_size() const {
void TabContainer::set_popup(Node *p_popup) { void TabContainer::set_popup(Node *p_popup) {
ERR_FAIL_NULL(p_popup); ERR_FAIL_NULL(p_popup);
popup = Object::cast_to<Popup>(p_popup); Popup *popup = Object::cast_to<Popup>(p_popup);
popup_obj_id = popup ? popup->get_instance_id() : 0;
update(); update();
} }
Popup *TabContainer::get_popup() const { Popup *TabContainer::get_popup() const {
return popup; if (popup_obj_id) {
Popup *popup = Object::cast_to<Popup>(ObjectDB::get_instance(popup_obj_id));
if (popup) {
return popup;
} else {
#ifdef DEBUG_ENABLED
ERR_PRINT("Popup assigned to TabContainer is gone!");
#endif
popup_obj_id = 0;
}
}
return NULL;
} }
void TabContainer::set_drag_to_rearrange_enabled(bool p_enabled) { void TabContainer::set_drag_to_rearrange_enabled(bool p_enabled) {
@ -1049,7 +1066,7 @@ TabContainer::TabContainer() {
previous = 0; previous = 0;
align = ALIGN_CENTER; align = ALIGN_CENTER;
tabs_visible = true; tabs_visible = true;
popup = NULL; popup_obj_id = 0;
drag_to_rearrange_enabled = false; drag_to_rearrange_enabled = false;
tabs_rearrange_group = -1; tabs_rearrange_group = -1;
use_hidden_tabs_for_min_size = false; use_hidden_tabs_for_min_size = false;

2
scene/gui/tab_container.h
View File

@ -58,7 +58,7 @@ private:
TabAlign align; TabAlign align;
Control *_get_tab(int p_idx) const; Control *_get_tab(int p_idx) const;
int _get_top_margin() const; int _get_top_margin() const;
Popup *popup; mutable ObjectID popup_obj_id;
bool drag_to_rearrange_enabled; bool drag_to_rearrange_enabled;
bool use_hidden_tabs_for_min_size; bool use_hidden_tabs_for_min_size;
int tabs_rearrange_group; int tabs_rearrange_group;