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

Merge pull request #17618 from groud/fix_gridcontainer 

Fixes wrong calculation of gridcontainer's children size
This commit is contained in:
Rémi Verschelde 2018-03-19 10:12:20 +01:00 committed by GitHub
parent 4f97d5a7e2 896e5a64d3
commit cc8f7c78af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/gui/grid_container.cpp
View File

@ -84,8 +84,8 @@ void GridContainer::_notification(int p_what) {
if (!row_expanded.has(E->key())) if (!row_expanded.has(E->key()))
remaining_space.height -= E->get(); remaining_space.height -= E->get();
} }
remaining_space.height -= vsep * (max_row - 1); remaining_space.height -= vsep * MAX(max_row - 1, 0);
remaining_space.width -= hsep * (max_col - 1); remaining_space.width -= hsep * MAX(max_col - 1, 0);
bool can_fit = false; bool can_fit = false;
while (!can_fit && col_expanded.size() > 0) { while (!can_fit && col_expanded.size() > 0) {