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

Revert "Began making the spaced property per-container." Things are more complicated here than it's worth. Will need to tear everything apart and redo the whole control hierarchy. Sigh... 

This reverts commit ea391ef841.
This commit is contained in:
Pietro Gagliardi 2014-10-12 11:54:58 -04:00
parent ea391ef841
commit 1b070b3f10
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
container.go
View File

@ -32,9 +32,11 @@ type controlSizing interface {
// All containers must embed containerbase. // All containers must embed containerbase.
type containerbase struct { type containerbase struct {
child Control 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) { func (c *container) resize(x, y, width, height int) {
if c.child == nil { // no children; nothing to do if c.child == nil { // no children; nothing to do
return return

2
container_darwin.go
View File

@ -49,7 +49,7 @@ const (
func (c *container) beginResize() (d *sizing) { func (c *container) beginResize() (d *sizing) {
d = new(sizing) d = new(sizing)
if c.spaced { if spaced {
d.xmargin = macXMargin d.xmargin = macXMargin
d.ymargintop = macYMargin d.ymargintop = macYMargin
d.ymarginbottom = d.ymargintop d.ymarginbottom = d.ymargintop

2
container_unix.go
View File

@ -56,7 +56,7 @@ const (
func (c *container) beginResize() (d *sizing) { func (c *container) beginResize() (d *sizing) {
d = new(sizing) d = new(sizing)
if c.spaced { if spaced {
d.xmargin = gtkXMargin d.xmargin = gtkXMargin
d.ymargintop = gtkYMargin d.ymargintop = gtkYMargin
d.ymarginbottom = d.ymargintop d.ymarginbottom = d.ymargintop

2
container_windows.go
View File

@ -122,7 +122,7 @@ func (c *container) beginResize() (d *sizing) {
d.baseY = baseY d.baseY = baseY
d.internalLeading = internalLeading d.internalLeading = internalLeading
if c.spaced { if spaced {
d.xmargin = fromdlgunitsX(marginDialogUnits, d) d.xmargin = fromdlgunitsX(marginDialogUnits, d)
d.ymargintop = fromdlgunitsY(marginDialogUnits, d) d.ymargintop = fromdlgunitsY(marginDialogUnits, d)
d.ymarginbottom = d.ymargintop d.ymarginbottom = d.ymargintop

2
zz_test.go
View File

@ -18,7 +18,6 @@ import (
var closeOnClick = flag.Bool("close", false, "close on click") 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 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 { type dtype struct {
Name string Name string
@ -263,6 +262,7 @@ var tw *testwin
// because Cocoa hates being run off the main thread, even if it's run exclusively off the main thread // because Cocoa hates being run off the main thread, even if it's run exclusively off the main thread
func init() { func init() {
flag.BoolVar(&spaced, "spaced", false, "enable spacing")
flag.Parse() flag.Parse()
go func() { go func() {
tw = new(testwin) tw = new(testwin)