joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-03 16:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

layout: simplify Stack API

Browse Source 
Similar to what a previous commit did for Flex, this change simplifies
Stack to just one Layout call:

	layout.Stack{}.Layout(gtx,
		layout.Stacked(func() {...}),
		layout.Expanded(func() {...}),
	)

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-12-12 00:26:49 +01:00
parent f60a5c7ac3
commit 7814da47a0
3 changed files with 129 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/button.go
+54 -55
View File
@@ -60,68 +60,67 @@ func (t *Theme) IconButton(icon *Icon) IconButton {
func (b Button) Layout(gtx *layout.Context, button *widget.Button) {
col := b.Color
bgcol := b.Background
st := layout.Stack{Alignment: layout.Center}
hmin := gtx.Constraints.Width.Min
vmin := gtx.Constraints.Height.Min
lbl := st.Rigid(gtx, func() {
gtx.Constraints.Width.Min = hmin
gtx.Constraints.Height.Min = vmin
layout.Align(layout.Center).Layout(gtx, func() {
layout.Inset{Top: unit.Dp(10), Bottom: unit.Dp(10), Left: unit.Dp(12), Right: unit.Dp(12)}.Layout(gtx, func() {
paint.ColorOp{Color: col}.Add(gtx.Ops)
widget.Label{}.Layout(gtx, b.shaper, b.Font, b.Text)
layout.Stack{Alignment: layout.Center}.Layout(gtx,
layout.Expanded(func() {
rr := float32(gtx.Px(unit.Dp(4)))
clip.Rect{
Rect: f32.Rectangle{Max: f32.Point{
X: float32(gtx.Constraints.Width.Min),
Y: float32(gtx.Constraints.Height.Min),
}},
NE: rr, NW: rr, SE: rr, SW: rr,
}.Op(gtx.Ops).Add(gtx.Ops)
fill(gtx, bgcol)
for _, c := range button.History() {
drawInk(gtx, c)
}
}),
layout.Stacked(func() {
gtx.Constraints.Width.Min = hmin
gtx.Constraints.Height.Min = vmin
layout.Align(layout.Center).Layout(gtx, func() {
layout.Inset{Top: unit.Dp(10), Bottom: unit.Dp(10), Left: unit.Dp(12), Right: unit.Dp(12)}.Layout(gtx, func() {
paint.ColorOp{Color: col}.Add(gtx.Ops)
widget.Label{}.Layout(gtx, b.shaper, b.Font, b.Text)
})
})
})
pointer.Rect(image.Rectangle{Max: gtx.Dimensions.Size}).Add(gtx.Ops)
button.Layout(gtx)
})
bg := st.Expand(gtx, func() {
rr := float32(gtx.Px(unit.Dp(4)))
clip.Rect{
Rect: f32.Rectangle{Max: f32.Point{
X: float32(gtx.Constraints.Width.Min),
Y: float32(gtx.Constraints.Height.Min),
}},
NE: rr, NW: rr, SE: rr, SW: rr,
}.Op(gtx.Ops).Add(gtx.Ops)
fill(gtx, bgcol)
for _, c := range button.History() {
drawInk(gtx, c)
}
})
st.Layout(gtx, bg, lbl)
pointer.Rect(image.Rectangle{Max: gtx.Dimensions.Size}).Add(gtx.Ops)
button.Layout(gtx)
}),
)
}
func (b IconButton) Layout(gtx *layout.Context, button *widget.Button) {
st := layout.Stack{}
ico := st.Rigid(gtx, func() {
layout.UniformInset(b.Padding).Layout(gtx, func() {
size := gtx.Px(b.Size) - 2*gtx.Px(b.Padding)
if b.Icon != nil {
b.Icon.Color = b.Color
b.Icon.Layout(gtx, unit.Px(float32(size)))
layout.Stack{}.Layout(gtx,
layout.Expanded(func() {
size := float32(gtx.Constraints.Width.Min)
rr := float32(size) * .5
clip.Rect{
Rect: f32.Rectangle{Max: f32.Point{X: size, Y: size}},
NE: rr, NW: rr, SE: rr, SW: rr,
}.Op(gtx.Ops).Add(gtx.Ops)
fill(gtx, b.Background)
for _, c := range button.History() {
drawInk(gtx, c)
}
gtx.Dimensions = layout.Dimensions{
Size: image.Point{X: size, Y: size},
}
})
pointer.Ellipse(image.Rectangle{Max: gtx.Dimensions.Size}).Add(gtx.Ops)
button.Layout(gtx)
})
bgcol := b.Background
bg := st.Expand(gtx, func() {
size := float32(gtx.Constraints.Width.Min)
rr := float32(size) * .5
clip.Rect{
Rect: f32.Rectangle{Max: f32.Point{X: size, Y: size}},
NE: rr, NW: rr, SE: rr, SW: rr,
}.Op(gtx.Ops).Add(gtx.Ops)
fill(gtx, bgcol)
for _, c := range button.History() {
drawInk(gtx, c)
}
})
st.Layout(gtx, bg, ico)
}),
layout.Stacked(func() {
layout.UniformInset(b.Padding).Layout(gtx, func() {
size := gtx.Px(b.Size) - 2*gtx.Px(b.Padding)
if b.Icon != nil {
b.Icon.Color = b.Color
b.Icon.Layout(gtx, unit.Px(float32(size)))
}
gtx.Dimensions = layout.Dimensions{
Size: image.Point{X: size, Y: size},
}
})
pointer.Ellipse(image.Rectangle{Max: gtx.Dimensions.Size}).Add(gtx.Ops)
button.Layout(gtx)
}),
)
}
func toPointF(p image.Point) f32.Point {