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: accept nil icon in IconButton.Layout

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-10-17 20:50:02 +02:00
parent 959da5e68f
commit bf6741f2d6
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/button.go
+9 -7
View File
@@ -111,13 +111,15 @@ func (b IconButton) Layout(gtx *layout.Context, button *widget.Button) {
ico := st.Rigid(gtx, func() { ico := st.Rigid(gtx, func() {
layout.UniformInset(b.Padding).Layout(gtx, func() { layout.UniformInset(b.Padding).Layout(gtx, func() {
size := gtx.Px(b.Size) - gtx.Px(b.Padding) size := gtx.Px(b.Size) - gtx.Px(b.Padding)
ico := b.Icon.image(size) if b.Icon != nil {
ico.Add(gtx.Ops) ico := b.Icon.image(size)
paint.PaintOp{ ico.Add(gtx.Ops)
Rect: f32.Rectangle{ paint.PaintOp{
Max: toPointF(ico.Size()), Rect: f32.Rectangle{
}, Max: toPointF(ico.Size()),
}.Add(gtx.Ops) },
}.Add(gtx.Ops)
}
gtx.Dimensions = layout.Dimensions{ gtx.Dimensions = layout.Dimensions{
Size: image.Point{X: size, Y: size}, Size: image.Point{X: size, Y: size},
} }