diff options
| author | Pietro Gagliardi <[email protected]> | 2014-10-11 20:16:38 -0400 |
|---|---|---|
| committer | Pietro Gagliardi <[email protected]> | 2014-10-11 20:16:38 -0400 |
| commit | ea391ef84109f42f7b5cf51b4976845e9320aa3f (patch) | |
| tree | 219c446f86720064f3704ff19583dd921fb2e6d7 | |
| parent | 99101c026469b579f3077401254c1b33ab0f1a59 (diff) | |
Began making the spaced property per-container.
| -rw-r--r-- | container.go | 4 | ||||
| -rw-r--r-- | container_darwin.go | 2 | ||||
| -rw-r--r-- | container_unix.go | 2 | ||||
| -rw-r--r-- | container_windows.go | 2 | ||||
| -rw-r--r-- | zz_test.go | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/container.go b/container.go index 143985c..ac6a354 100644 --- a/container.go +++ b/container.go @@ -32,11 +32,9 @@ type controlSizing interface { // All containers must embed containerbase. type containerbase struct { child Control + spaced bool } -// set to true to apply spacing to all windows -var spaced bool = false - func (c *container) resize(x, y, width, height int) { if c.child == nil { // no children; nothing to do return diff --git a/container_darwin.go b/container_darwin.go index b2086c4..ef0355b 100644 --- a/container_darwin.go +++ b/container_darwin.go @@ -49,7 +49,7 @@ const ( func (c *container) beginResize() (d *sizing) { d = new(sizing) - if spaced { + if c.spaced { d.xmargin = macXMargin d.ymargintop = macYMargin d.ymarginbottom = d.ymargintop diff --git a/container_unix.go b/container_unix.go index ffb1ffa..4db046c 100644 --- a/container_unix.go +++ b/container_unix.go @@ -56,7 +56,7 @@ const ( func (c *container) beginResize() (d *sizing) { d = new(sizing) - if spaced { + if c.spaced { d.xmargin = gtkXMargin d.ymargintop = gtkYMargin d.ymarginbottom = d.ymargintop diff --git a/container_windows.go b/container_windows.go index 99be1c2..39e1a5c 100644 --- a/container_windows.go +++ b/container_windows.go @@ -122,7 +122,7 @@ func (c *container) beginResize() (d *sizing) { d.baseY = baseY d.internalLeading = internalLeading - if spaced { + if c.spaced { d.xmargin = fromdlgunitsX(marginDialogUnits, d) d.ymargintop = fromdlgunitsY(marginDialogUnits, d) d.ymarginbottom = d.ymargintop @@ -18,6 +18,7 @@ import ( var closeOnClick = flag.Bool("close", false, "close on click") var smallWindow = flag.Bool("small", false, "open a small window (test Mac OS X initial control sizing)") +var spaced = flag.Bool("spaced", false, "enable spacing") type dtype struct { Name string @@ -262,7 +263,6 @@ var tw *testwin // because Cocoa hates being run off the main thread, even if it's run exclusively off the main thread func init() { - flag.BoolVar(&spaced, "spaced", false, "enable spacing") flag.Parse() go func() { tw = new(testwin) |