summaryrefslogtreecommitdiff
path: root/stack.go
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2014-06-25 23:05:29 -0400
committerPietro Gagliardi <[email protected]>2014-06-25 23:05:29 -0400
commit9a3e73b46001219177bb13a381420007217dfecf (patch)
treeaada49b967ea0bcd9ca220011e9854a54cd4149a /stack.go
parent92afc9b9447b4ce8961a0c9a02802c5300f886b5 (diff)
Finished the Windows conversion to the new sizing system. Untested.
Diffstat (limited to 'stack.go')
-rw-r--r--stack.go9
1 files changed, 6 insertions, 3 deletions
diff --git a/stack.go b/stack.go
index a0c3104..4311b37 100644
--- a/stack.go
+++ b/stack.go
@@ -85,9 +85,12 @@ func (s *Stack) allocate(x int, y int, width int, height int, d *sysSizeData) (a
return nil
}
// before we do anything, steal the margin so nested Stacks/Grids don't double down
- margin := d.margin
- d.margin = 0
-_=margin
+ xmargin := d.xmargin
+ ymargin := d.ymargin
+ d.xmargin = 0
+ d.ymargin = 0
+_=xmargin
+_=ymargin
// 1) get height and width of non-stretchy controls; figure out how much space is alloted to stretchy controls
stretchywid = width
stretchyht = height