From bf6741f2d66a8abcfcbedeb323c08d956f8f00fd Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 17 Oct 2019 20:50:02 +0200 Subject: [PATCH] widget/material: accept nil icon in IconButton.Layout Signed-off-by: Elias Naur --- widget/material/button.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/widget/material/button.go b/widget/material/button.go index 953fbd49..37ce7c70 100644 --- a/widget/material/button.go +++ b/widget/material/button.go @@ -111,13 +111,15 @@ func (b IconButton) Layout(gtx *layout.Context, button *widget.Button) { ico := st.Rigid(gtx, func() { layout.UniformInset(b.Padding).Layout(gtx, func() { size := gtx.Px(b.Size) - gtx.Px(b.Padding) - ico := b.Icon.image(size) - ico.Add(gtx.Ops) - paint.PaintOp{ - Rect: f32.Rectangle{ - Max: toPointF(ico.Size()), - }, - }.Add(gtx.Ops) + if b.Icon != nil { + ico := b.Icon.image(size) + ico.Add(gtx.Ops) + paint.PaintOp{ + Rect: f32.Rectangle{ + Max: toPointF(ico.Size()), + }, + }.Add(gtx.Ops) + } gtx.Dimensions = layout.Dimensions{ Size: image.Point{X: size, Y: size}, }