From 0d543a098b482ca71b92e9005d265ed152e9ffb6 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 6 Oct 2023 18:33:56 -0500 Subject: [PATCH] gesture: [API] rename ClickType to ClickKind "Kind" is the Go idiomatic name for distinguishing structs outside of the type system. Signed-off-by: Elias Naur --- gesture/gesture.go | 36 ++++++++++++++++++------------------ gesture/gesture_test.go | 2 +- widget/button.go | 8 ++++---- widget/editor.go | 4 ++-- widget/enum.go | 6 +++--- widget/list.go | 2 +- widget/selectable.go | 4 ++-- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/gesture/gesture.go b/gesture/gesture.go index 347db5567..a51b74b5b 100644 --- a/gesture/gesture.go +++ b/gesture/gesture.go @@ -87,10 +87,10 @@ type Click struct { } // ClickEvent represent a click action, either a -// TypePress for the beginning of a click or a -// TypeClick for a completed click. +// KindPress for the beginning of a click or a +// KindClick for a completed click. type ClickEvent struct { - Type ClickType + Kind ClickKind Position image.Point Source pointer.Source Modifiers key.Modifiers @@ -99,7 +99,7 @@ type ClickEvent struct { NumClicks int } -type ClickType uint8 +type ClickKind uint8 // Drag detects drag gestures in the form of pointer.Drag events. type Drag struct { @@ -136,15 +136,15 @@ const ( ) const ( - // TypePress is reported for the first pointer + // KindPress is reported for the first pointer // press. - TypePress ClickType = iota - // TypeClick is reported when a click action + KindPress ClickKind = iota + // KindClick is reported when a click action // is complete. - TypeClick - // TypeCancel is reported when the gesture is + KindClick + // KindCancel is reported when the gesture is // cancelled. - TypeCancel + KindCancel ) const ( @@ -192,9 +192,9 @@ func (c *Click) Events(q event.Queue) []ClickEvent { } c.pressed = false if !c.entered || c.hovered { - events = append(events, ClickEvent{Type: TypeClick, Position: e.Position.Round(), Source: e.Source, Modifiers: e.Modifiers, NumClicks: c.clicks}) + events = append(events, ClickEvent{Kind: KindClick, Position: e.Position.Round(), Source: e.Source, Modifiers: e.Modifiers, NumClicks: c.clicks}) } else { - events = append(events, ClickEvent{Type: TypeCancel}) + events = append(events, ClickEvent{Kind: KindCancel}) } case pointer.Cancel: wasPressed := c.pressed @@ -202,7 +202,7 @@ func (c *Click) Events(q event.Queue) []ClickEvent { c.hovered = false c.entered = false if wasPressed { - events = append(events, ClickEvent{Type: TypeCancel}) + events = append(events, ClickEvent{Kind: KindCancel}) } case pointer.Press: if c.pressed { @@ -224,7 +224,7 @@ func (c *Click) Events(q event.Queue) []ClickEvent { c.clicks = 1 } c.clickedAt = e.Time - events = append(events, ClickEvent{Type: TypePress, Position: e.Position.Round(), Source: e.Source, Modifiers: e.Modifiers, NumClicks: c.clicks}) + events = append(events, ClickEvent{Kind: KindPress, Position: e.Position.Round(), Source: e.Source, Modifiers: e.Modifiers, NumClicks: c.clicks}) case pointer.Leave: if !c.pressed { c.pid = e.PointerID @@ -444,13 +444,13 @@ func (a Axis) String() string { } } -func (ct ClickType) String() string { +func (ct ClickKind) String() string { switch ct { - case TypePress: + case KindPress: return "TypePress" - case TypeClick: + case KindClick: return "TypeClick" - case TypeCancel: + case KindCancel: return "TypeCancel" default: panic("invalid ClickType") diff --git a/gesture/gesture_test.go b/gesture/gesture_test.go index 8dc3f7aec..376292fd1 100644 --- a/gesture/gesture_test.go +++ b/gesture/gesture_test.go @@ -110,7 +110,7 @@ func mouseClickEvents(times ...time.Duration) []event.Event { func filterMouseClicks(events []ClickEvent) []ClickEvent { var clicks []ClickEvent for _, ev := range events { - if ev.Type == TypeClick { + if ev.Kind == KindClick { clicks = append(clicks, ev) } } diff --git a/widget/button.go b/widget/button.go index c45bc929f..38ba483c5 100644 --- a/widget/button.go +++ b/widget/button.go @@ -149,8 +149,8 @@ func (b *Clickable) update(gtx layout.Context) { b.prevClicks = n for _, e := range b.click.Events(gtx) { - switch e.Type { - case gesture.TypeClick: + switch e.Kind { + case gesture.KindClick: b.clicks = append(b.clicks, Click{ Modifiers: e.Modifiers, NumClicks: e.NumClicks, @@ -158,14 +158,14 @@ func (b *Clickable) update(gtx layout.Context) { if l := len(b.history); l > 0 { b.history[l-1].End = gtx.Now } - case gesture.TypeCancel: + case gesture.KindCancel: for i := range b.history { b.history[i].Cancelled = true if b.history[i].End.IsZero() { b.history[i].End = gtx.Now } } - case gesture.TypePress: + case gesture.KindPress: if e.Source == pointer.Mouse { key.FocusOp{Tag: &b.keyTag}.Add(gtx.Ops) } diff --git a/widget/editor.go b/widget/editor.go index 521a21de4..3f7a4e760 100644 --- a/widget/editor.go +++ b/widget/editor.go @@ -238,8 +238,8 @@ func (e *Editor) processPointer(gtx layout.Context) { switch evt := evt.(type) { case gesture.ClickEvent: switch { - case evt.Type == gesture.TypePress && evt.Source == pointer.Mouse, - evt.Type == gesture.TypeClick && evt.Source != pointer.Mouse: + case evt.Kind == gesture.KindPress && evt.Source == pointer.Mouse, + evt.Kind == gesture.KindClick && evt.Source != pointer.Mouse: prevCaretPos, _ := e.text.Selection() e.blinkStart = gtx.Now e.text.MoveCoord(image.Point{ diff --git a/widget/enum.go b/widget/enum.go index 97118bf94..afc65e58a 100644 --- a/widget/enum.go +++ b/widget/enum.go @@ -74,12 +74,12 @@ func (e *Enum) Layout(gtx layout.Context, k string, content layout.Widget) layou } clk := &state.click for _, ev := range clk.Events(gtx) { - switch ev.Type { - case gesture.TypePress: + switch ev.Kind { + case gesture.KindPress: if ev.Source == pointer.Mouse { key.FocusOp{Tag: &state.tag}.Add(gtx.Ops) } - case gesture.TypeClick: + case gesture.KindClick: if state.key != e.Value { e.Value = state.key e.changed = true diff --git a/widget/list.go b/widget/list.go index 1c45523fc..7248133c3 100644 --- a/widget/list.go +++ b/widget/list.go @@ -62,7 +62,7 @@ func (s *Scrollbar) Layout(gtx layout.Context, axis layout.Axis, viewportStart, // Jump to a click in the track. for _, event := range s.track.Events(gtx) { - if event.Type != gesture.TypeClick || + if event.Kind != gesture.KindClick || event.Modifiers != key.Modifiers(0) || event.NumClicks > 1 { continue diff --git a/widget/selectable.go b/widget/selectable.go index 7c6fb6fee..c241ffef5 100644 --- a/widget/selectable.go +++ b/widget/selectable.go @@ -236,8 +236,8 @@ func (e *Selectable) processPointer(gtx layout.Context) { switch evt := evt.(type) { case gesture.ClickEvent: switch { - case evt.Type == gesture.TypePress && evt.Source == pointer.Mouse, - evt.Type == gesture.TypeClick && evt.Source != pointer.Mouse: + case evt.Kind == gesture.KindPress && evt.Source == pointer.Mouse, + evt.Kind == gesture.KindClick && evt.Source != pointer.Mouse: prevCaretPos, _ := e.text.Selection() e.text.MoveCoord(image.Point{ X: int(math.Round(float64(evt.Position.X))),