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

TabContainer now reports proper minimum size, closes #4896

This commit is contained in:
Juan Linietsky 2016-06-17 18:38:40 -03:00
parent 95dc15b750
commit 65bcde0a7d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scene/gui/tab_container.cpp
View File

@ -704,13 +704,13 @@ Size2 TabContainer::get_minimum_size() const {
if (c->is_set_as_toplevel()) if (c->is_set_as_toplevel())
continue; continue;
if (!c->has_meta("_tab_name")) //if (!c->has_meta("_tab_name"))
continue; // continue;
if (!c->is_visible()) if (!c->is_visible())
continue; continue;
Size2 cms = c->get_minimum_size(); Size2 cms = c->get_combined_minimum_size();
ms.x=MAX(ms.x,cms.x); ms.x=MAX(ms.x,cms.x);
ms.y=MAX(ms.y,cms.y); ms.y=MAX(ms.y,cms.y);
} }
@ -722,6 +722,9 @@ Size2 TabContainer::get_minimum_size() const {
ms.y+=MAX(tab_bg->get_minimum_size().y,tab_fg->get_minimum_size().y); ms.y+=MAX(tab_bg->get_minimum_size().y,tab_fg->get_minimum_size().y);
ms.y+=font->get_height(); ms.y+=font->get_height();
Ref<StyleBox> sb = get_stylebox("panel");
ms+=sb->get_minimum_size();
return ms; return ms;
} }