interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed empty cells in Grid not handled correctly.

This commit is contained in:
Pietro Gagliardi 2014-09-01 13:31:39 -04:00
parent 53c57267b1
commit 76c518b3e2
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grid.go
View File

@ -288,6 +288,7 @@ 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 {
if c != nil { // treat empty cells like spaces
cell := g.controls[c] cell := g.controls[c]
as := c.allocate(x + cell.xoff, y + cell.yoff, cell.width, cell.height, d) as := c.allocate(x + cell.xoff, y + cell.yoff, cell.width, cell.height, d)
if current != nil { // connect first left to first right if current != nil { // connect first left to first right
@ -299,6 +300,7 @@ func (g *grid) allocate(x int, y int, width int, height int, d *sizing) (allocat
current = nil // spaces don't have allocation data current = nil // spaces don't have allocation data
} }
allocations = append(allocations, as...) allocations = append(allocations, as...)
}
x += colwidths[col] + d.xpadding x += colwidths[col] + d.xpadding
} }
x = startx x = startx