~eliasnaur/gio

8d838e89f5d55769f72bef1e3314532f37cd1892 — Elias Naur a month ago d017c72
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>
3 files changed, 8 insertions(+), 8 deletions(-)

M widget/bool.go
M widget/button.go
M widget/material/button.go
M widget/bool.go => widget/bool.go +2 -2
@@ 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,
			}

M widget/button.go => widget/button.go +5 -5
@@ 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(),
			})

M widget/material/button.go => widget/material/button.go +1 -1
@@ 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