From 9a3e73b46001219177bb13a381420007217dfecf Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Wed, 25 Jun 2014 23:05:29 -0400
Subject: Finished the Windows conversion to the new sizing system. Untested.

---
 stack.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'stack.go')

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
-- 
cgit v1.2.3