Fixed empty cells in Grid not handled correctly.
This commit is contained in:
parent
53c57267b1
commit
76c518b3e2
22
grid.go
22
grid.go
|
@ -288,17 +288,19 @@ func (g *grid) allocate(x int, y int, width int, height int, d *sizing) (allocat
|
||||||
for row, xcol := range g.grid {
|
for row, xcol := range g.grid {
|
||||||
current = nil
|
current = nil
|
||||||
for col, c := range xcol {
|
for col, c := range xcol {
|
||||||
cell := g.controls[c]
|
if c != nil { // treat empty cells like spaces
|
||||||
as := c.allocate(x + cell.xoff, y + cell.yoff, cell.width, cell.height, d)
|
cell := g.controls[c]
|
||||||
if current != nil { // connect first left to first right
|
as := c.allocate(x + cell.xoff, y + cell.yoff, cell.width, cell.height, d)
|
||||||
current.neighbor = c
|
if current != nil { // connect first left to first right
|
||||||
|
current.neighbor = c
|
||||||
|
}
|
||||||
|
if len(as) != 0 {
|
||||||
|
current = as[0] // next left is first subwidget
|
||||||
|
} else {
|
||||||
|
current = nil // spaces don't have allocation data
|
||||||
|
}
|
||||||
|
allocations = append(allocations, as...)
|
||||||
}
|
}
|
||||||
if len(as) != 0 {
|
|
||||||
current = as[0] // next left is first subwidget
|
|
||||||
} else {
|
|
||||||
current = nil // spaces don't have allocation data
|
|
||||||
}
|
|
||||||
allocations = append(allocations, as...)
|
|
||||||
x += colwidths[col] + d.xpadding
|
x += colwidths[col] + d.xpadding
|
||||||
}
|
}
|
||||||
x = startx
|
x = startx
|
||||||
|
|
Loading…
Reference in New Issue