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

Fix infinite loop in GridContainer layout 

I had a grid container and tried to set rect.min_height larger in the
editor; that caused an infinite loop in GridContainer::_notification
at line 118. The reason is max_index was being set to the *height* of
the row, not the *index* of the row. So later when it tried to erase
that row and try again, there was nothing to erase.
I applied the same fix to the width code.
This commit is contained in:
Gary Oberbrunner 2018-03-02 14:32:22 -05:00
parent eceba5aa6a
commit 561e57df13
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/gui/grid_container.cpp
View File

@ -36,10 +36,10 @@ void GridContainer::_notification(int p_what) {
case NOTIFICATION_SORT_CHILDREN: { case NOTIFICATION_SORT_CHILDREN: {
Map<int, int> col_minw; Map<int, int> col_minw; // max of min_width of all controls in each col (indexed by col)
Map<int, int> row_minh; Map<int, int> row_minh; // max of min_height of all controls in each row (indexed by row)
Set<int> col_expanded; Set<int> col_expanded; // columns which have the SIZE_EXPAND flag set
Set<int> row_expanded; Set<int> row_expanded; // rows which have the SIZE_EXPAND flag set
int hsep = get_constant("hseparation"); int hsep = get_constant("hseparation");
int vsep = get_constant("vseparation"); int vsep = get_constant("vseparation");
@ -94,7 +94,7 @@ void GridContainer::_notification(int p_what) {
int max_index = 0; int max_index = 0;
for (Set<int>::Element *E = col_expanded.front(); E; E = E->next()) { for (Set<int>::Element *E = col_expanded.front(); E; E = E->next()) {
if (col_minw[E->get()] > col_minw[max_index]) { if (col_minw[E->get()] > col_minw[max_index]) {
max_index = col_minw[E->get()]; max_index = E->get();
} }
if (can_fit && (remaining_space.width / col_expanded.size()) < col_minw[E->get()]) { if (can_fit && (remaining_space.width / col_expanded.size()) < col_minw[E->get()]) {
can_fit = false; can_fit = false;
@ -115,7 +115,7 @@ void GridContainer::_notification(int p_what) {
int max_index = 0; int max_index = 0;
for (Set<int>::Element *E = row_expanded.front(); E; E = E->next()) { for (Set<int>::Element *E = row_expanded.front(); E; E = E->next()) {
if (row_minh[E->get()] > row_minh[max_index]) { if (row_minh[E->get()] > row_minh[max_index]) {
max_index = row_minh[E->get()]; max_index = E->get();
} }
if (can_fit && (remaining_space.height / row_expanded.size()) < row_minh[E->get()]) { if (can_fit && (remaining_space.height / row_expanded.size()) < row_minh[E->get()]) {
can_fit = false; can_fit = false;