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

widget/material: update buttons to use new paint Fill API

Browse Source 
Signed-off-by: Chris Waldon <christopher.waldon.dev@gmail.com>
This commit is contained in:
Chris Waldon
2020-10-21 21:32:21 -04:00
committed by Elias Naur
parent fc307c1e71
commit 3d042093a5
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/button.go
+11 -15
View File
@@ -123,22 +123,19 @@ func (b ButtonLayoutStyle) Layout(gtx layout.Context, w layout.Widget) layout.Di
return layout.Stack{Alignment: layout.Center}.Layout(gtx, return layout.Stack{Alignment: layout.Center}.Layout(gtx,
layout.Expanded(func(gtx layout.Context) layout.Dimensions { layout.Expanded(func(gtx layout.Context) layout.Dimensions {
rr := float32(gtx.Px(b.CornerRadius)) rr := float32(gtx.Px(b.CornerRadius))
clip.RRect{ clip.UniformRRect(f32.Rectangle{Max: f32.Point{
Rect: f32.Rectangle{Max: f32.Point{ X: float32(gtx.Constraints.Min.X),
X: float32(gtx.Constraints.Min.X), Y: float32(gtx.Constraints.Min.Y),
Y: float32(gtx.Constraints.Min.Y), }}, rr).Add(gtx.Ops)
}},
NE: rr, NW: rr, SE: rr, SW: rr,
}.Add(gtx.Ops)
background := b.Background background := b.Background
if gtx.Queue == nil { if gtx.Queue == nil {
background = f32color.MulAlpha(b.Background, 150) background = f32color.MulAlpha(b.Background, 150)
} }
dims := fill(gtx, background) paint.Fill(gtx.Ops, background)
for _, c := range b.Button.History() { for _, c := range b.Button.History() {
drawInk(gtx, c) drawInk(gtx, c)
} }
return dims return layout.Dimensions{Size: gtx.Constraints.Min}
}), }),
layout.Stacked(func(gtx layout.Context) layout.Dimensions { layout.Stacked(func(gtx layout.Context) layout.Dimensions {
gtx.Constraints.Min = min gtx.Constraints.Min = min
@@ -154,19 +151,18 @@ func (b IconButtonStyle) Layout(gtx layout.Context) layout.Dimensions {
sizex, sizey := gtx.Constraints.Min.X, gtx.Constraints.Min.Y sizex, sizey := gtx.Constraints.Min.X, gtx.Constraints.Min.Y
sizexf, sizeyf := float32(sizex), float32(sizey) sizexf, sizeyf := float32(sizex), float32(sizey)
rr := (sizexf + sizeyf) * .25 rr := (sizexf + sizeyf) * .25
clip.RRect{ clip.UniformRRect(f32.Rectangle{
Rect: f32.Rectangle{Max: f32.Point{X: sizexf, Y: sizeyf}}, Max: f32.Point{X: sizexf, Y: sizeyf},
NE: rr, NW: rr, SE: rr, SW: rr, }, rr).Add(gtx.Ops)
}.Add(gtx.Ops)
background := b.Background background := b.Background
if gtx.Queue == nil { if gtx.Queue == nil {
background = f32color.MulAlpha(b.Background, 150) background = f32color.MulAlpha(b.Background, 150)
} }
dims := fill(gtx, background) paint.Fill(gtx.Ops, background)
for _, c := range b.Button.History() { for _, c := range b.Button.History() {
drawInk(gtx, c) drawInk(gtx, c)
} }
return dims return layout.Dimensions{Size: gtx.Constraints.Min}
}), }),
layout.Stacked(func(gtx layout.Context) layout.Dimensions { layout.Stacked(func(gtx layout.Context) layout.Dimensions {
return b.Inset.Layout(gtx, func(gtx layout.Context) layout.Dimensions { return b.Inset.Layout(gtx, func(gtx layout.Context) layout.Dimensions {