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

bad lookup in grid container corrected, cells are properly aligned again. Fixes #1462

Browse Source
This commit is contained in:
Juan Linietsky
2015-04-28 23:10:06 -03:00
parent fa83cf3c96
commit 7773d70f44
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
scene/gui/grid_container.cpp
View File

@ -69,6 +69,7 @@ void GridContainer::_notification(int p_what) {
else else
row_minh[row]=ms.height; row_minh[row]=ms.height;
// print_line("store row "+itos(row)+" mw "+itos(ms.height));
if (c->get_h_size_flags()&SIZE_EXPAND) if (c->get_h_size_flags()&SIZE_EXPAND)
col_expanded.insert(col); col_expanded.insert(col);
@ -121,23 +122,22 @@ void GridContainer::_notification(int p_what) {
row_ofs+=row_minh[row-1]+sep+(row_expanded.has(row-1)?row_expand:0); row_ofs+=row_minh[row-1]+sep+(row_expanded.has(row-1)?row_expand:0);
} }
if (c->is_visible()) { Size2 s;
Size2 s; if (col_minw.has(col))
if (col_minw.has(col)) s.width=col_minw[col];
s.width=col_minw[col]; if (row_minh.has(row))
if (row_minh.has(row)) s.height=row_minh[row];
s.height=row_minh[col];
if (row_expanded.has(row)) if (row_expanded.has(row))
s.height+=row_expand; s.height+=row_expand;
if (col_expanded.has(col)) if (col_expanded.has(col))
s.width+=col_expand; s.width+=col_expand;
Point2 p(col_ofs,row_ofs); Point2 p(col_ofs,row_ofs);
fit_child_in_rect(c,Rect2(p,s)); // print_line("col: "+itos(col)+" row: "+itos(row)+" col_ofs: "+itos(col_ofs)+" row_ofs: "+itos(row_ofs));
fit_child_in_rect(c,Rect2(p,s));
} //print_line("col: "+itos(col)+" row: "+itos(row)+" rect: "+Rect2(p,s));
if (col_minw.has(col)) { if (col_minw.has(col)) {
col_ofs+=col_minw[col]+sep+(col_expanded.has(col)?col_expand:0); col_ofs+=col_minw[col]+sep+(col_expanded.has(col)?col_expand:0);