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

widget/material: remove bogus minimum cosntraint from checkable

Browse Source 
checkable.layout forces the label to take up at least constraints.min
space. However, for min == max, the total checkbox plus label would then
overflow. The minimum constraint doesn't seem necessary anymore, so drop
it.

Remove a superfluous layout.W layout as well.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-03-03 17:32:31 +01:00
parent 57dee8e61a
commit de7a5985d5
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/checkable.go
+3 -7
View File
@@ -38,7 +38,6 @@ func (c *checkable) layout(gtx layout.Context, checked, hovered bool) layout.Dim
icon = c.uncheckedStateIcon
}
min := gtx.Constraints.Min
dims := layout.Flex{Alignment: layout.Middle}.Layout(gtx,
layout.Rigid(func(gtx layout.Context) layout.Dimensions {
return layout.Stack{Alignment: layout.Center}.Layout(gtx,
@@ -77,12 +76,9 @@ func (c *checkable) layout(gtx layout.Context, checked, hovered bool) layout.Dim
}),
layout.Rigid(func(gtx layout.Context) layout.Dimensions {
gtx.Constraints.Min = min
return layout.W.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
return layout.UniformInset(unit.Dp(2)).Layout(gtx, func(gtx layout.Context) layout.Dimensions {
paint.ColorOp{Color: c.Color}.Add(gtx.Ops)
return widget.Label{}.Layout(gtx, c.shaper, c.Font, c.TextSize, c.Label)
})
return layout.UniformInset(unit.Dp(2)).Layout(gtx, func(gtx layout.Context) layout.Dimensions {
paint.ColorOp{Color: c.Color}.Add(gtx.Ops)
return widget.Label{}.Layout(gtx, c.shaper, c.Font, c.TextSize, c.Label)
})
}),
)