widget,widget/material: rename widget.Click to widget.Press

Press tracks pointer presses, not clicks, and we're about to add a Click
type that does.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-05-24 12:28:59 +02:00
parent d017c722f5
commit 8d838e89f5
3 changed files with 8 additions and 8 deletions
+2 -2
View File
@@ -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,
}
+5 -5
View File
@@ -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(),
})
+1 -1
View File
@@ -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