From 160408ec034419f3c0270c82a029777c82d035c3 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 15 Oct 2019 21:19:15 +0200 Subject: [PATCH] widget/material: use constraint minimums for background fills --- widget/material/button.go | 6 +++--- widget/material/material.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/widget/material/button.go b/widget/material/button.go index cf77b7f8..989ecd68 100644 --- a/widget/material/button.go +++ b/widget/material/button.go @@ -94,8 +94,8 @@ func (b Button) Layout(gtx *layout.Context, button *widget.Button) { bg := st.Expand(gtx, func() { rr := float32(gtx.Px(unit.Dp(4))) rrect(gtx.Ops, - float32(gtx.Constraints.Width.Max), - float32(gtx.Constraints.Height.Max), + float32(gtx.Constraints.Width.Min), + float32(gtx.Constraints.Height.Min), rr, rr, rr, rr, ) fill(gtx, bgcol) @@ -130,7 +130,7 @@ func (b IconButton) Layout(gtx *layout.Context, button *widget.Button) { bgcol.A = 0xaa } bg := st.Expand(gtx, func() { - size := float32(gtx.Constraints.Width.Max) + size := float32(gtx.Constraints.Width.Min) rr := float32(size) * .5 rrect(gtx.Ops, size, diff --git a/widget/material/material.go b/widget/material/material.go index 0ca180c1..4b3dcfeb 100644 --- a/widget/material/material.go +++ b/widget/material/material.go @@ -47,7 +47,7 @@ func argb(c uint32) color.RGBA { func fill(gtx *layout.Context, col color.RGBA) { 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{ Max: f32.Point{X: float32(d.X), Y: float32(d.Y)}, }