joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-08 02:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

widget/material: use constraint minimums for background fills

Browse Source
This commit is contained in:
Elias Naur
2019-10-15 21:19:15 +02:00
parent 2990ceda69
commit 160408ec03
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/button.go
+3 -3
View File
@@ -94,8 +94,8 @@ func (b Button) Layout(gtx *layout.Context, button *widget.Button) {
bg := st.Expand(gtx, func() { bg := st.Expand(gtx, func() {
rr := float32(gtx.Px(unit.Dp(4))) rr := float32(gtx.Px(unit.Dp(4)))
rrect(gtx.Ops, rrect(gtx.Ops,
float32(gtx.Constraints.Width.Max), float32(gtx.Constraints.Width.Min),
float32(gtx.Constraints.Height.Max), float32(gtx.Constraints.Height.Min),
rr, rr, rr, rr, rr, rr, rr, rr,
) )
fill(gtx, bgcol) fill(gtx, bgcol)
@@ -130,7 +130,7 @@ func (b IconButton) Layout(gtx *layout.Context, button *widget.Button) {
bgcol.A = 0xaa bgcol.A = 0xaa
} }
bg := st.Expand(gtx, func() { bg := st.Expand(gtx, func() {
size := float32(gtx.Constraints.Width.Max) size := float32(gtx.Constraints.Width.Min)
rr := float32(size) * .5 rr := float32(size) * .5
rrect(gtx.Ops, rrect(gtx.Ops,
size, size,
widget/material/material.go
+1 -1
View File
@@ -47,7 +47,7 @@ func argb(c uint32) color.RGBA {
func fill(gtx *layout.Context, col color.RGBA) { func fill(gtx *layout.Context, col color.RGBA) {
cs := gtx.Constraints cs := gtx.Constraints
d := image.Point{X: cs.Width.Max, Y: cs.Height.Max} d := image.Point{X: cs.Width.Min, Y: cs.Height.Min}
dr := f32.Rectangle{ dr := f32.Rectangle{
Max: f32.Point{X: float32(d.X), Y: float32(d.Y)}, Max: f32.Point{X: float32(d.X), Y: float32(d.Y)},
} }