diff --git a/widget/bool.go b/widget/bool.go index 5afaece4..d0a56949 100644 --- a/widget/bool.go +++ b/widget/bool.go @@ -8,7 +8,7 @@ import ( type Bool struct { Value bool // Last is the last registered click. - Last Click + Last Press // changeVal tracks Value from the most recent call to Changed. changeVal bool @@ -28,7 +28,7 @@ func (b *Bool) Layout(gtx layout.Context) { for _, e := range b.gesture.Events(gtx) { switch e.Type { case gesture.TypeClick: - b.Last = Click{ + b.Last = Press{ Time: gtx.Now(), Position: e.Position, } diff --git a/widget/button.go b/widget/button.go index 85c4a130..7a488cf4 100644 --- a/widget/button.go +++ b/widget/button.go @@ -18,11 +18,11 @@ type Clickable struct { click gesture.Click // clicks tracks the number of unreported clicks. clicks int - history []Click + history []Press } -// Click represents a past click. -type Click struct { +// Press represents a past pointer press. +type Press struct { Position f32.Point Time time.Time } @@ -39,7 +39,7 @@ func (b *Clickable) Clicked() bool { // History is the past pointer presses useful for drawing markers. // History is retained for a short duration (about a second). -func (b *Clickable) History() []Click { +func (b *Clickable) History() []Press { return b.history } @@ -68,7 +68,7 @@ func (b *Clickable) update(gtx layout.Context) { case gesture.TypeClick: b.clicks++ case gesture.TypePress: - b.history = append(b.history, Click{ + b.history = append(b.history, Press{ Position: e.Position, Time: gtx.Now(), }) diff --git a/widget/material/button.go b/widget/material/button.go index 5396e5f2..bb5f7f31 100644 --- a/widget/material/button.go +++ b/widget/material/button.go @@ -180,7 +180,7 @@ func (b IconButtonStyle) Layout(gtx layout.Context) layout.Dimensions { ) } -func drawInk(gtx layout.Context, c widget.Click) { +func drawInk(gtx layout.Context, c widget.Press) { d := gtx.Now().Sub(c.Time) t := float32(d.Seconds()) const duration = 0.5