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: add Float.Invert

Browse Source 
Setting Float.Invert=true not only inverts the order of values (which was already easily done by swapping min and max), it also draws the widget inverted so that the track is darkened on the opposite side from usual.

This patch also fixes a bug wherein a vertical slider was drawn inverted by default.

Signed-off-by: Gordon Klaus <gordon.klaus@gmail.com>
This commit is contained in:
Gordon Klaus
2023-01-19 11:37:11 +01:00
committed by Elias Naur
parent ac2c284d16
commit 22aa00f476
2 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/slider.go
+23 -13
View File
@@ -61,26 +61,36 @@ func (s SliderStyle) Layout(gtx layout.Context) layout.Dimensions {
color = f32color.Disabled(color)
}
// Draw track before thumb.
track := image.Rectangle{
Min: axis.Convert(image.Pt(thumbRadius, sizeCross/2-trackWidth/2)),
Max: axis.Convert(image.Pt(thumbPos, sizeCross/2+trackWidth/2)),
rect := func(minx, miny, maxx, maxy int) image.Rectangle {
r := image.Rect(minx, miny, maxx, maxy)
if s.Float.Invert != (axis == layout.Vertical) {
r.Max.X, r.Min.X = sizeMain-r.Min.X, sizeMain-r.Max.X
}
r.Min = axis.Convert(r.Min)
r.Max = axis.Convert(r.Max)
return r
}
// Draw track before thumb.
track := rect(
thumbRadius, sizeCross/2-trackWidth/2,
thumbPos, sizeCross/2+trackWidth/2,
)
paint.FillShape(gtx.Ops, color, clip.Rect(track).Op())
// Draw track after thumb.
track = image.Rectangle{
Min: axis.Convert(image.Pt(thumbPos, axis.Convert(track.Min).Y)),
Max: axis.Convert(image.Pt(sizeMain-thumbRadius, axis.Convert(track.Max).Y)),
}
track = rect(
thumbPos, axis.Convert(track.Min).Y,
sizeMain-thumbRadius, axis.Convert(track.Max).Y,
)
paint.FillShape(gtx.Ops, f32color.MulAlpha(color, 96), clip.Rect(track).Op())
// Draw thumb.
pt := axis.Convert(image.Pt(thumbPos, sizeCross/2))
thumb := image.Rectangle{
Min: image.Pt(pt.X-thumbRadius, pt.Y-thumbRadius),
Max: image.Pt(pt.X+thumbRadius, pt.Y+thumbRadius),
}
pt := image.Pt(thumbPos, sizeCross/2)
thumb := rect(
pt.X-thumbRadius, pt.Y-thumbRadius,
pt.X+thumbRadius, pt.Y+thumbRadius,
)
paint.FillShape(gtx.Ops, color, clip.Ellipse(thumb).Op(gtx.Ops))
return layout.Dimensions{Size: size}