asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #17410 from groud/fix_grid_container

Browse source 
Fixes infinite loop in GridContainer
This commit is contained in:
Rémi Verschelde 2018-03-13 10:34:31 +01:00 committed by GitHub
commit b1c9a7c757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scene/gui/grid_container.cpp
View file

@ -88,10 +88,10 @@ void GridContainer::_notification(int p_what) {
remaining_space.width -= hsep * (max_col - 1); remaining_space.width -= hsep * (max_col - 1);
bool can_fit = false; bool can_fit = false;
while (!can_fit) { while (!can_fit && col_expanded.size() > 0) {
// Check if all minwidth constraints are ok if we use the remaining space // Check if all minwidth constraints are ok if we use the remaining space
can_fit = true; can_fit = true;
int max_index = 0; int max_index = col_expanded.front()->get();
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 = E->get(); max_index = E->get();
@ -109,10 +109,10 @@ void GridContainer::_notification(int p_what) {
} }
can_fit = false; can_fit = false;
while (!can_fit) { while (!can_fit && row_expanded.size() > 0) {
// Check if all minwidth constraints are ok if we use the remaining space // Check if all minwidth constraints are ok if we use the remaining space
can_fit = true; can_fit = true;
int max_index = 0; int max_index = row_expanded.front()->get();
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 = E->get(); max_index = E->get();