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

widget/material: fade out inkwells a little longer than their expansions

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-06-09 22:29:43 +02:00
parent 0715c801e2
commit a24a2c9fb6
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/button.go
+8 -6
View File
@@ -193,12 +193,14 @@ func drawInk(gtx layout.Context, c widget.Press) {
// duration is the number of seconds for the // duration is the number of seconds for the
// completed animation: expand while fading in, then // completed animation: expand while fading in, then
// out. // out.
const duration = float32(0.5) const (
expandDuration = float32(0.5)
fadeDuration = float32(0.9)
)
now := gtx.Now() now := gtx.Now()
t := float32(now.Sub(c.Start).Seconds()) t := float32(now.Sub(c.Start).Seconds())
t /= duration
end := c.End end := c.End
if end.IsZero() { if end.IsZero() {
@@ -207,7 +209,6 @@ func drawInk(gtx layout.Context, c widget.Press) {
} }
endt := float32(end.Sub(c.Start).Seconds()) endt := float32(end.Sub(c.Start).Seconds())
endt /= duration
// Compute the fade-in/out position in [0;1]. // Compute the fade-in/out position in [0;1].
var alphat float32 var alphat float32
@@ -217,19 +218,19 @@ func drawInk(gtx layout.Context, c widget.Press) {
// If the press was cancelled before the inkwell // If the press was cancelled before the inkwell
// was fully faded in, fast forward the animation // was fully faded in, fast forward the animation
// to match the fade-out. // to match the fade-out.
if h := 0.5 - endt; h > 0 { if h := 0.5 - endt/fadeDuration; h > 0 {
haste = h haste = h
} }
} }
// Fade in. // Fade in.
half1 := t + haste half1 := t/fadeDuration + haste
if half1 > 0.5 { if half1 > 0.5 {
half1 = 0.5 half1 = 0.5
} }
// Fade out. // Fade out.
half2 := float32(now.Sub(end).Seconds()) half2 := float32(now.Sub(end).Seconds())
half2 /= duration half2 /= fadeDuration
half2 += haste half2 += haste
if half2 > 0.5 { if half2 > 0.5 {
// Too old. // Too old.
@@ -245,6 +246,7 @@ func drawInk(gtx layout.Context, c widget.Press) {
// Freeze expansion of cancelled presses. // Freeze expansion of cancelled presses.
sizet = endt sizet = endt
} }
sizet /= expandDuration
// Animate only ended presses, and presses that are fading in. // Animate only ended presses, and presses that are fading in.
if !c.End.IsZero() || sizet <= 1.0 { if !c.End.IsZero() || sizet <= 1.0 {