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

Implemented padding on Stack.

This commit is contained in:
Pietro Gagliardi 2014-06-26 10:55:11 -04:00
parent 1819bbed49
commit 3bedaf483a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
stack.go
View File

@ -89,11 +89,16 @@ func (s *Stack) allocate(x int, y int, width int, height int, d *sysSizeData) (a
ymargin := d.ymargin ymargin := d.ymargin
d.xmargin = 0 d.xmargin = 0
d.ymargin = 0 d.ymargin = 0
// 0) inset the available rect by the margins // 0) inset the available rect by the margins and needed padding
x += xmargin x += xmargin
y += ymargin y += ymargin
width -= xmargin * 2 width -= xmargin * 2
height -= ymargin * 2 height -= ymargin * 2
if s.orientation == horizontal {
width -= (len(s.controls) - 1) * d.xpadding
} else {
height -= (len(s.controls) - 1) * d.ypadding
}
// 1) get height and width of non-stretchy controls; figure out how much space is alloted to stretchy controls // 1) get height and width of non-stretchy controls; figure out how much space is alloted to stretchy controls
stretchywid = width stretchywid = width
stretchyht = height stretchyht = height
@ -144,15 +149,16 @@ func (s *Stack) allocate(x int, y int, width int, height int, d *sysSizeData) (a
} }
allocations = append(allocations, as...) allocations = append(allocations, as...)
if s.orientation == horizontal { if s.orientation == horizontal {
x += s.width[i] x += s.width[i] + d.xpadding
} else { } else {
y += s.height[i] y += s.height[i] + d.ypadding
} }
} }
return allocations return allocations
} }
// The preferred size of a Stack is the sum of the preferred sizes of non-stretchy controls + (the number of stretchy controls * the largest preferred size among all stretchy controls). // The preferred size of a Stack is the sum of the preferred sizes of non-stretchy controls + (the number of stretchy controls * the largest preferred size among all stretchy controls).
// We don't consider the margins here, but will need to if Window.SizeToFit() is ever made a thing.
func (s *Stack) preferredSize(d *sysSizeData) (width int, height int) { func (s *Stack) preferredSize(d *sysSizeData) (width int, height int) {
max := func(a int, b int) int { max := func(a int, b int) int {
if a > b { if a > b {
@ -167,6 +173,11 @@ func (s *Stack) preferredSize(d *sysSizeData) (width int, height int) {
if len(s.controls) == 0 { // no controls, so return emptiness if len(s.controls) == 0 { // no controls, so return emptiness
return 0, 0 return 0, 0
} }
if s.orientation == horizontal {
width = (len(s.controls) - 1) * d.xpadding
} else {
height = (len(s.controls) - 1) * d.ypadding
}
for i, c := range s.controls { for i, c := range s.controls {
w, h := c.preferredSize(d) w, h := c.preferredSize(d)
if s.stretchy[i] { if s.stretchy[i] {