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

Migrated existing controls to the new sizing system.

This commit is contained in:
Pietro Gagliardi 2014-06-25 22:17:26 -04:00
parent e4992dbcb2
commit 057f0eaf53
8 changed files with 113 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
area.go
View File

@ -336,20 +336,29 @@ func (a *Area) make(window *sysData) error {
return nil return nil
} }
func (a *Area) setRect(x int, y int, width int, height int, rr *[]resizerequest) { func (a *Area) allocate(x int, y int, width int, height int, d *sysSizeData) []*allocation {
*rr = append(*rr, resizerequest{ return []*allocation{&allocation{
sysData: a.sysData,
x: x, x: x,
y: y, y: y,
width: width, width: width,
height: height, height: height,
}) this: a,
}}
} }
func (a *Area) preferredSize() (width int, height int, yoff int) { func (a *Area) preferredSize(d *sysSizeData) (width int, height int) {
return a.sysData.preferredSize() return a.sysData.preferredSize(d)
} }
func (a *Area) commitResize(a *allocation, d *sysSizeData) {
a.sysData.preferredSize(a, d)
}
func (a *Area) getAuxResizeInfo(d *sysSizeData) {
a.sysData.getAuxResizeInfo(d)
}
// internal function, but shared by all system implementations: &img.Pix[0] is not necessarily the first pixel in the image // internal function, but shared by all system implementations: &img.Pix[0] is not necessarily the first pixel in the image
func pixelDataPos(img *image.RGBA) int { func pixelDataPos(img *image.RGBA) int {
return img.PixOffset(img.Rect.Min.X, img.Rect.Min.Y) return img.PixOffset(img.Rect.Min.X, img.Rect.Min.Y)

20
button.go
View File

@ -65,16 +65,24 @@ func (b *Button) make(window *sysData) error {
return nil return nil
} }
func (b *Button) setRect(x int, y int, width int, height int, rr *[]resizerequest) { func (b *Button) allocate(x int, y int, width int, height int, d *sysSizeData) []*allocation {
*rr = append(*rr, resizerequest{ return []*allocation{&allocation{
sysData: b.sysData,
x: x, x: x,
y: y, y: y,
width: width, width: width,
height: height, height: height,
}) this: b,
}}
} }
func (b *Button) preferredSize() (width int, height int, yoff int) { func (b *Button) preferredSize(d *sysSizeData) (width int, height int) {
return b.sysData.preferredSize() return b.sysData.preferredSize(d)
}
func (b *Button) commitResize(a *allocation, d *sysSizeData) {
b.sysData.preferredSize(a, d)
}
func (b *Button) getAuxResizeInfo(d *sysSizeData) {
b.sysData.getAuxResizeInfo(d)
} }

20
checkbox.go
View File

@ -70,16 +70,24 @@ func (c *Checkbox) make(window *sysData) error {
return nil return nil
} }
func (c *Checkbox) setRect(x int, y int, width int, height int, rr *[]resizerequest) { func (c *Checkbox) allocate(x int, y int, width int, height int, d *sysSizeData) []*allocation {
*rr = append(*rr, resizerequest{ return []*allocation{&allocation{
sysData: c.sysData,
x: x, x: x,
y: y, y: y,
width: width, width: width,
height: height, height: height,
}) this: c,
}}
} }
func (c *Checkbox) preferredSize() (width int, height int, yoff int) { func (c *Checkbox) preferredSize(d *sysSizeData) (width int, height int) {
return c.sysData.preferredSize() return c.sysData.preferredSize(d)
}
func (c *Checkbox) commitResize(a *allocation, d *sysSizeData) {
c.sysData.preferredSize(a, d)
}
func (c *Checkbox) getAuxResizeInfo(d *sysSizeData) {
c.sysData.getAuxResizeInfo(d)
} }

20
combobox.go
View File

@ -147,16 +147,24 @@ func (c *Combobox) make(window *sysData) (err error) {
return nil return nil
} }
func (c *Combobox) setRect(x int, y int, width int, height int, rr *[]resizerequest) { func (c *Combobox) allocate(x int, y int, width int, height int, d *sysSizeData) []*allocation {
*rr = append(*rr, resizerequest{ return []*allocation{&allocation{
sysData: c.sysData,
x: x, x: x,
y: y, y: y,
width: width, width: width,
height: height, height: height,
}) this: c,
}}
} }
func (c *Combobox) preferredSize() (width int, height int, yoff int) { func (c *Combobox) preferredSize(d *sysSizeData) (width int, height int) {
return c.sysData.preferredSize() return c.sysData.preferredSize(d)
}
func (c *Combobox) commitResize(a *allocation, d *sysSizeData) {
c.sysData.preferredSize(a, d)
}
func (c *Combobox) getAuxResizeInfo(d *sysSizeData) {
c.sysData.getAuxResizeInfo(d)
} }

20
label.go
View File

@ -74,16 +74,24 @@ func (l *Label) make(window *sysData) error {
return nil return nil
} }
func (l *Label) setRect(x int, y int, width int, height int, rr *[]resizerequest) { func (l *Label) allocate(x int, y int, width int, height int, d *sysSizeData) []*allocation {
*rr = append(*rr, resizerequest{ return []*allocation{&allocation{
sysData: l.sysData,
x: x, x: x,
y: y, y: y,
width: width, width: width,
height: height, height: height,
}) this: l,
}}
} }
func (l *Label) preferredSize() (width int, height int, yoff int) { func (l *Label) preferredSize(d *sysSizeData) (width int, height int) {
return l.sysData.preferredSize() return l.sysData.preferredSize(d)
}
func (l *Label) commitResize(a *allocation, d *sysSizeData) {
l.sysData.preferredSize(a, d)
}
func (l *Label) getAuxResizeInfo(d *sysSizeData) {
l.sysData.getAuxResizeInfo(d)
} }

20
lineedit.go
View File

@ -68,16 +68,24 @@ func (l *LineEdit) make(window *sysData) error {
return nil return nil
} }
func (l *LineEdit) setRect(x int, y int, width int, height int, rr *[]resizerequest) { func (l *LineEdit) allocate(x int, y int, width int, height int, d *sysSizeData) []*allocation {
*rr = append(*rr, resizerequest{ return []*allocation{&allocation{
sysData: l.sysData,
x: x, x: x,
y: y, y: y,
width: width, width: width,
height: height, height: height,
}) this: l,
}}
} }
func (l *LineEdit) preferredSize() (width int, height int, yoff int) { func (l *LineEdit) preferredSize(d *sysSizeData) (width int, height int) {
return l.sysData.preferredSize() return l.sysData.preferredSize(d)
}
func (l *LineEdit) commitResize(a *allocation, d *sysSizeData) {
l.sysData.preferredSize(a, d)
}
func (l *LineEdit) getAuxResizeInfo(d *sysSizeData) {
l.sysData.getAuxResizeInfo(d)
} }

20
listbox.go
View File

@ -150,16 +150,24 @@ func (l *Listbox) make(window *sysData) (err error) {
return nil return nil
} }
func (l *Listbox) setRect(x int, y int, width int, height int, rr *[]resizerequest) { func (l *Listbox) allocate(x int, y int, width int, height int, d *sysSizeData) []*allocation {
*rr = append(*rr, resizerequest{ return []*allocation{&allocation{
sysData: l.sysData,
x: x, x: x,
y: y, y: y,
width: width, width: width,
height: height, height: height,
}) this: l,
}}
} }
func (l *Listbox) preferredSize() (width int, height int, yoff int) { func (l *Listbox) preferredSize(d *sysSizeData) (width int, height int) {
return l.sysData.preferredSize() return l.sysData.preferredSize(d)
}
func (l *Listbox) commitResize(a *allocation, d *sysSizeData) {
l.sysData.preferredSize(a, d)
}
func (l *Listbox) getAuxResizeInfo(d *sysSizeData) {
l.sysData.getAuxResizeInfo(d)
} }

20
progressbar.go
View File

@ -56,16 +56,24 @@ func (p *ProgressBar) make(window *sysData) error {
return nil return nil
} }
func (p *ProgressBar) setRect(x int, y int, width int, height int, rr *[]resizerequest) { func (p *ProgressBar) allocate(x int, y int, width int, height int, d *sysSizeData) []*allocation {
*rr = append(*rr, resizerequest{ return []*allocation{&allocation{
sysData: p.sysData,
x: x, x: x,
y: y, y: y,
width: width, width: width,
height: height, height: height,
}) this: p,
}}
} }
func (p *ProgressBar) preferredSize() (width int, height int, yoff int) { func (p *ProgressBar) preferredSize(d *sysSizeData) (width int, height int) {
return p.sysData.preferredSize() return p.sysData.preferredSize(d)
}
func (p *ProgressBar) commitResize(a *allocation, d *sysSizeData) {
p.sysData.preferredSize(a, d)
}
func (p *ProgressBar) getAuxResizeInfo(d *sysSizeData) {
p.sysData.getAuxResizeInfo(d)
} }