aboutsummaryrefslogtreecommitdiff
path: root/scene/gui/grid_container.cpp
diff options
context:
space:
mode:
authorGary Oberbrunner2018-03-02 14:32:22 -0500
committerGary Oberbrunner2018-03-10 14:38:35 -0500
commit561e57df1386122714fae7b413be91e210b33b65 (patch)
treef07ecb2bb48a8cc94cc07288dc22631dc50d18ff /scene/gui/grid_container.cpp
parenteceba5aa6a36521c878cf976845123e820d27161 (diff)
downloadgodot-561e57df1386122714fae7b413be91e210b33b65.tar.gz
godot-561e57df1386122714fae7b413be91e210b33b65.tar.zst
godot-561e57df1386122714fae7b413be91e210b33b65.zip
Diffstat (limited to 'scene/gui/grid_container.cpp')
-rw-r--r--scene/gui/grid_container.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp
index 9aac5137b..2799131f7 100644
--- a/scene/gui/grid_container.cpp
+++ b/scene/gui/grid_container.cpp
@@ -36,10 +36,10 @@ void GridContainer::_notification(int p_what) {
case NOTIFICATION_SORT_CHILDREN: {
- Map<int, int> col_minw;
- Map<int, int> row_minh;
- Set<int> col_expanded;
- Set<int> row_expanded;
+ 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)
+ Set<int> col_expanded; // columns which have the SIZE_EXPAND flag set
+ Set<int> row_expanded; // rows which have the SIZE_EXPAND flag set
int hsep = get_constant("hseparation");
int vsep = get_constant("vseparation");
@@ -94,7 +94,7 @@ void GridContainer::_notification(int p_what) {
int max_index = 0;
for (Set<int>::Element *E = col_expanded.front(); E; E = E->next()) {
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()]) {
can_fit = false;
@@ -115,7 +115,7 @@ void GridContainer::_notification(int p_what) {
int max_index = 0;
for (Set<int>::Element *E = row_expanded.front(); E; E = E->next()) {
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()]) {
can_fit = false;