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

widget/material: use clip.Circle to draw circles

Browse Source 
Signed-off-by: Egon Elbre <egonelbre@gmail.com>
This commit is contained in:
Egon Elbre
2021-03-13 14:46:46 +02:00
committed by Elias Naur
parent ee8e267d22
commit b9f2e0fb41
3 changed files with 30 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/switch.go
+18 -22
View File
@@ -88,30 +88,34 @@ func (s SwitchStyle) Layout(gtx layout.Context) layout.Dimensions {
op.Offset(f32.Point{X: float32(off)}).Add(gtx.Ops)
}
thumbRadius := float32(thumbSize) / 2
// Draw hover.
if s.Switch.Hovered() {
var p clip.Path
r := 1.7 * float32(thumbSize) / 2
p.Begin(gtx.Ops)
//p.Move(f32.Pt(-float32(thumbSize)/2, -float32(thumbSize)/2))
p.Move(f32.Pt(-r+float32(thumbSize)/2, -r+float32(thumbSize)/2))
addCircle(&p, r)
r := 1.7 * thumbRadius
background := f32color.MulAlpha(s.Color.Enabled, 70)
paint.FillShape(gtx.Ops, background, clip.Outline{Path: p.End()}.Op())
paint.FillShape(gtx.Ops, background,
clip.Circle{
Center: f32.Point{X: thumbRadius, Y: thumbRadius},
Radius: r,
}.Op(gtx.Ops))
}
// Draw thumb shadow, a translucent disc slightly larger than the
// thumb itself.
shadowStack := op.Save(gtx.Ops)
shadowSize := float32(2)
// Center shadow horizontally and slightly adjust its Y.
op.Offset(f32.Point{X: -shadowSize / 2, Y: -.75}).Add(gtx.Ops)
drawDisc(gtx.Ops, float32(thumbSize)+shadowSize, argb(0x55000000))
shadowStack.Load()
paint.FillShape(gtx.Ops, argb(0x55000000),
clip.Circle{
Center: f32.Point{X: thumbRadius, Y: thumbRadius + .25},
Radius: thumbRadius + 1,
}.Op(gtx.Ops))
// Draw thumb.
drawDisc(gtx.Ops, float32(thumbSize), col)
stack.Load()
paint.FillShape(gtx.Ops, col,
clip.Circle{
Center: f32.Point{X: thumbRadius, Y: thumbRadius},
Radius: thumbRadius,
}.Op(gtx.Ops))
// Set up click area.
stack = op.Save(gtx.Ops)
@@ -130,11 +134,3 @@ func (s SwitchStyle) Layout(gtx layout.Context) layout.Dimensions {
dims := image.Point{X: trackWidth, Y: thumbSize}
return layout.Dimensions{Size: dims}
}
func drawDisc(ops *op.Ops, sz float32, col color.NRGBA) {
defer op.Save(ops).Load()
rr := sz / 2
clip.UniformRRect(f32.Rectangle{Max: f32.Pt(sz, sz)}, rr).Add(ops)
paint.ColorOp{Color: col}.Add(ops)
paint.PaintOp{}.Add(ops)
}