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

widget/material: add and use Icon.Layout method

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-10-21 09:20:17 +02:00
parent dafb180176
commit 78963bdaae
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/button.go
+11 -7
View File
@@ -112,13 +112,7 @@ func (b IconButton) Layout(gtx *layout.Context, button *widget.Button) {
layout.UniformInset(b.Padding).Layout(gtx, func() {
size := gtx.Px(b.Size) - gtx.Px(b.Padding)
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)
b.Icon.Layout(gtx, unit.Px(float32(size)))
}
gtx.Dimensions = layout.Dimensions{
Size: image.Point{X: size, Y: size},
@@ -147,6 +141,16 @@ func (b IconButton) Layout(gtx *layout.Context, button *widget.Button) {
st.Layout(gtx, bg, ico)
}
func (ic *Icon) Layout(gtx *layout.Context, sz unit.Value) {
ico := ic.image(gtx.Px(sz))
ico.Add(gtx.Ops)
paint.PaintOp{
Rect: f32.Rectangle{
Max: toPointF(ico.Size()),
},
}.Add(gtx.Ops)
}
func (ic *Icon) image(sz int) paint.ImageOp {
if sz == ic.imgSize {
return ic.op