max width and max height of row/col wasn't calculated properly

diff --git a/grid.c b/grid.c
index e2924b297bf6cd51fcb954c92a094e0572231c01..66d88069febbaaedf3e01734595799677778e72e 100644 (file)
--- a/grid.c
+++ b/grid.c
@@ -112,8 +112,8 @@ static void shuffleGrid(newtGrid grid, int left, int top, int set) {
 
            j += field->padLeft + field->padRight;
 
-           i += j;
            if (j > widths[col]) widths[col] = j;
+           i += widths[col];
        }
 
        if (i > minWidth) minWidth = i;
@@ -136,8 +136,8 @@ static void shuffleGrid(newtGrid grid, int left, int top, int set) {
 
            j += field->padTop + field->padBottom;
 
-           i += j;
            if (j > heights[row]) heights[row] = j;
+           i += heights[row];
        }
 
        if (i > minHeight) minHeight = i;

diff --git a/testgrid.c b/testgrid.c
index c7497faf4e34db17de4752ef84ec8c0deb9b472a..87cbb1f13b421b9cbfff132b9ca8a8203a0368b9 100644 (file)
--- a/testgrid.c
+++ b/testgrid.c
@@ -25,9 +25,7 @@ int main(void) {
     newtInit();
     newtCls();
 
-    newtOpenWindow(2, 2, 40, 15, "first window");
-
-    b1 = newtButton(-1, -1, "Button 1");
+    b1 = newtCheckbox(-1, -1, "An pretty long checkbox for testing", ' ', NULL, NULL);
     b2 = newtButton(-1, -1, "Another Button");
     b3 = newtButton(-1, -1, "But, but");
     b4 = newtButton(-1, -1, "But what?");
@@ -44,7 +42,7 @@ int main(void) {
 
     newtFormAddComponents(f, b1, b2, b3, b4, NULL);
 
-    newtGridPlace(grid, 1, 1);
+    newtGridWrappedWindow(grid, "first window");
 
     answer = newtRunForm(f);