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: draw Loader completely inside its bounds

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-05-19 19:35:04 +02:00
parent 039b4c4bca
commit d5b70c439c
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/loader.go
+10 -9
View File
@@ -35,11 +35,11 @@ func (l LoaderStyle) Layout(gtx layout.Context) layout.Dimensions {
diam = gtx.Px(unit.Dp(24)) diam = gtx.Px(unit.Dp(24))
} }
sz := gtx.Constraints.Constrain(image.Pt(diam, diam)) sz := gtx.Constraints.Constrain(image.Pt(diam, diam))
radius := float64(sz.X) * .5 radius := float32(sz.X) * .5
defer op.Save(gtx.Ops).Load() defer op.Save(gtx.Ops).Load()
op.Offset(f32.Pt(float32(radius), float32(radius))).Add(gtx.Ops) op.Offset(f32.Pt(radius, radius)).Add(gtx.Ops)
dt := (time.Duration(gtx.Now.UnixNano()) % (time.Second)).Seconds() dt := float32((time.Duration(gtx.Now.UnixNano()) % (time.Second)).Seconds())
startAngle := dt * math.Pi * 2 startAngle := dt * math.Pi * 2
endAngle := startAngle + math.Pi*1.5 endAngle := startAngle + math.Pi*1.5
@@ -47,7 +47,7 @@ func (l LoaderStyle) Layout(gtx layout.Context) layout.Dimensions {
paint.ColorOp{ paint.ColorOp{
Color: l.Color, Color: l.Color,
}.Add(gtx.Ops) }.Add(gtx.Ops)
op.Offset(f32.Pt(-float32(radius), -float32(radius))).Add(gtx.Ops) op.Offset(f32.Pt(-radius, -radius)).Add(gtx.Ops)
paint.PaintOp{}.Add(gtx.Ops) paint.PaintOp{}.Add(gtx.Ops)
op.InvalidateOp{}.Add(gtx.Ops) op.InvalidateOp{}.Add(gtx.Ops)
return layout.Dimensions{ return layout.Dimensions{
@@ -55,16 +55,17 @@ func (l LoaderStyle) Layout(gtx layout.Context) layout.Dimensions {
} }
} }
func clipLoader(ops *op.Ops, startAngle, endAngle, radius float64) { func clipLoader(ops *op.Ops, startAngle, endAngle, radius float32) {
const thickness = .25 const thickness = .25
var ( var (
width = float32(radius * thickness) width = radius * thickness
delta = float32(endAngle - startAngle) delta = endAngle - startAngle
vy, vx = math.Sincos(startAngle) vy, vx = math.Sincos(float64(startAngle))
pen = f32.Pt(float32(vx), float32(vy)).Mul(float32(radius)) inner = radius * (1. - thickness*.5)
pen = f32.Pt(float32(vx), float32(vy)).Mul(inner)
center = f32.Pt(0, 0).Sub(pen) center = f32.Pt(0, 0).Sub(pen)
p clip.Path p clip.Path