Implemented window margins for Grids and Stacks.

This commit is contained in:
Pietro Gagliardi 2014-06-26 10:36:59 -04:00
parent 131809fc62
commit 214467bb93
3 changed files with 11 additions and 4 deletions

View File

@ -139,8 +139,11 @@ func (g *Grid) allocate(x int, y int, width int, height int, d *sysSizeData) (al
ymargin := d.ymargin
d.xmargin = 0
d.ymargin = 0
_=xmargin
_=ymargin
// 0) inset the available rect by the margins
x += xmargin
y += ymargin
width -= xmargin * 2
height -= ymargin * 2
// 1) clear data structures
for i := range g.rowheights {
g.rowheights[i] = 0

View File

@ -89,8 +89,11 @@ func (s *Stack) allocate(x int, y int, width int, height int, d *sysSizeData) (a
ymargin := d.ymargin
d.xmargin = 0
d.ymargin = 0
_=xmargin
_=ymargin
// 0) inset the available rect by the margins
x += xmargin
y += ymargin
width -= xmargin * 2
height -= ymargin * 2
// 1) get height and width of non-stretchy controls; figure out how much space is alloted to stretchy controls
stretchywid = width
stretchyht = height

View File

@ -41,6 +41,7 @@ func gridWindow() *Window {
l20, c21, l22)
g.SetFilling(1, 2)
g.SetStretchy(1, 1)
w.SetSpaced(*spacingTest)
w.Open(g)
return w
}