joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 09:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

widget/material: respect height minimum constraint in Button.Layout

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-10-23 09:56:34 +02:00
parent 2884604521
commit 0504c27e46
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/button.go
+10 -6
View File
@@ -82,13 +82,17 @@ func (b Button) Layout(gtx *layout.Context, button *widget.Button) {
col = rgb(0x888888) col = rgb(0x888888)
bgcol = rgb(0xcccccc) bgcol = rgb(0xcccccc)
} }
st := layout.Stack{} st := layout.Stack{Alignment: layout.Center}
min := gtx.Constraints.Width.Min hmin := gtx.Constraints.Width.Min
vmin := gtx.Constraints.Height.Min
lbl := st.Rigid(gtx, func() { lbl := st.Rigid(gtx, func() {
gtx.Constraints.Width.Min = min gtx.Constraints.Width.Min = hmin
layout.UniformInset(unit.Dp(16)).Layout(gtx, func() { gtx.Constraints.Height.Min = vmin
paint.ColorOp{Color: col}.Add(gtx.Ops) layout.Align(layout.Center).Layout(gtx, func() {
widget.Label{Alignment: text.Middle}.Layout(gtx, b.shaper, b.Font, b.Text) layout.UniformInset(unit.Dp(16)).Layout(gtx, func() {
paint.ColorOp{Color: col}.Add(gtx.Ops)
widget.Label{}.Layout(gtx, b.shaper, b.Font, b.Text)
})
}) })
pointer.RectAreaOp{Rect: image.Rectangle{Max: gtx.Dimensions.Size}}.Add(gtx.Ops) pointer.RectAreaOp{Rect: image.Rectangle{Max: gtx.Dimensions.Size}}.Add(gtx.Ops)
button.Layout(gtx) button.Layout(gtx)