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

Fix GridContainer's children visibility breaking the layout

Browse Source
This commit is contained in:
groud 2018-04-23 20:00:06 +02:00
parent 1c419531a0
commit c3f982156d
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scene/gui/grid_container.cpp
View File

@ -36,6 +36,8 @@ void GridContainer::_notification(int p_what) {
case NOTIFICATION_SORT_CHILDREN: { case NOTIFICATION_SORT_CHILDREN: {
int valid_controls_index;
Map<int, int> col_minw; // max of min_width of all controls in each col (indexed by col) Map<int, int> col_minw; // max of min_width of all controls in each col (indexed by col)
Map<int, int> row_minh; // max of min_height of all controls in each row (indexed by row) Map<int, int> row_minh; // max of min_height of all controls in each row (indexed by row)
Set<int> col_expanded; // columns which have the SIZE_EXPAND flag set Set<int> col_expanded; // columns which have the SIZE_EXPAND flag set
@ -47,13 +49,15 @@ void GridContainer::_notification(int p_what) {
int max_row = get_child_count() / columns; int max_row = get_child_count() / columns;
// Compute the per-column/per-row data // Compute the per-column/per-row data
valid_controls_index = 0;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = Object::cast_to<Control>(get_child(i)); Control *c = Object::cast_to<Control>(get_child(i));
if (!c || !c->is_visible_in_tree()) if (!c || !c->is_visible_in_tree())
continue; continue;
int row = i / columns; int row = valid_controls_index / columns;
int col = i % columns; int col = valid_controls_index % columns;
valid_controls_index++;
Size2i ms = c->get_combined_minimum_size(); Size2i ms = c->get_combined_minimum_size();
if (col_minw.has(col)) if (col_minw.has(col))
@ -136,12 +140,14 @@ void GridContainer::_notification(int p_what) {
int col_ofs = 0; int col_ofs = 0;
int row_ofs = 0; int row_ofs = 0;
valid_controls_index = 0;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = Object::cast_to<Control>(get_child(i)); Control *c = Object::cast_to<Control>(get_child(i));
if (!c || !c->is_visible_in_tree()) if (!c || !c->is_visible_in_tree())
continue; continue;
int row = i / columns; int row = valid_controls_index / columns;
int col = i % columns; int col = valid_controls_index % columns;
valid_controls_index++;
if (col == 0) { if (col == 0) {
col_ofs = 0; col_ofs = 0;
@ -190,17 +196,19 @@ Size2 GridContainer::get_minimum_size() const {
int hsep = get_constant("hseparation"); int hsep = get_constant("hseparation");
int vsep = get_constant("vseparation"); int vsep = get_constant("vseparation");
int idx = 0;
int max_row = 0; int max_row = 0;
int max_col = 0; int max_col = 0;
int valid_controls_index = 0;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = Object::cast_to<Control>(get_child(i)); Control *c = Object::cast_to<Control>(get_child(i));
if (!c || !c->is_visible_in_tree()) if (!c || !c->is_visible_in_tree())
continue; continue;
int row = idx / columns; int row = valid_controls_index / columns;
int col = idx % columns; int col = valid_controls_index % columns;
valid_controls_index++;
Size2i ms = c->get_combined_minimum_size(); Size2i ms = c->get_combined_minimum_size();
if (col_minw.has(col)) if (col_minw.has(col))
col_minw[col] = MAX(col_minw[col], ms.width); col_minw[col] = MAX(col_minw[col], ms.width);
@ -213,7 +221,6 @@ Size2 GridContainer::get_minimum_size() const {
row_minh[row] = ms.height; row_minh[row] = ms.height;
max_col = MAX(col, max_col); max_col = MAX(col, max_col);
max_row = MAX(row, max_row); max_row = MAX(row, max_row);
idx++;
} }
Size2 ms; Size2 ms;