GridLayout: Fix size calculation when spanning over empty section

lxn · Jul 27, 2017 · 7a6f8cb · 7a6f8cb
1 parent dbba749
commit 7a6f8cb
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/gridlayout.go b/gridlayout.go
@@ -510,17 +510,21 @@ func (l *GridLayout) Update(reset bool) error {
 
 		w := 0
 		for i := info.cell.column; i < info.cell.column+info.spanHorz; i++ {
-			w += widths[i]
-			if i > info.cell.column {
-				w += l.spacing
+			if width := widths[i]; width > 0 {
+				w += width
+				if i > info.cell.column {
+					w += l.spacing
+				}
 			}
 		}
 
 		h := 0
 		for i := info.cell.row; i < info.cell.row+info.spanVert; i++ {
-			h += heights[i]
-			if i > info.cell.row {
-				h += l.spacing
+			if height := heights[i]; height > 0 {
+				h += height
+				if i > info.cell.row {
+					h += l.spacing
+				}
 			}
 		}