joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

widget/material: remove Inset from ButtonLayoutStyle

Browse Source 
ButtonLayout is for custom button content; insets belong to the
custom content, not the button.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-06-30 20:42:59 +02:00
parent 958b19ae22
commit 6ef1ff7cfb
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/button.go
+5 -8
View File
@@ -34,7 +34,6 @@ type ButtonStyle struct {
type ButtonLayoutStyle struct {
Background color.RGBA
CornerRadius unit.Value
Inset layout.Inset
Button *widget.Clickable
}
@@ -70,7 +69,6 @@ func ButtonLayout(th *Theme, button *widget.Clickable) ButtonLayoutStyle {
Button: button,
Background: th.Color.Primary,
CornerRadius: unit.Dp(4),
Inset: layout.UniformInset(unit.Dp(12)),
}
}
@@ -110,11 +108,12 @@ func (b ButtonStyle) Layout(gtx layout.Context) layout.Dimensions {
return ButtonLayoutStyle{
Background: b.Background,
CornerRadius: b.CornerRadius,
Inset: b.Inset,
Button: b.Button,
}.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
paint.ColorOp{Color: b.Color}.Add(gtx.Ops)
return widget.Label{Alignment: text.Middle}.Layout(gtx, b.shaper, b.Font, b.TextSize, b.Text)
return b.Inset.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
paint.ColorOp{Color: b.Color}.Add(gtx.Ops)
return widget.Label{Alignment: text.Middle}.Layout(gtx, b.shaper, b.Font, b.TextSize, b.Text)
})
})
}
@@ -142,9 +141,7 @@ func (b ButtonLayoutStyle) Layout(gtx layout.Context, w layout.Widget) layout.Di
}),
layout.Stacked(func(gtx layout.Context) layout.Dimensions {
gtx.Constraints.Min = min
return layout.Center.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
return b.Inset.Layout(gtx, w)
})
return layout.Center.Layout(gtx, w)
}),
layout.Expanded(b.Button.Layout),
)