From f2fee00bab6e9b25fb123442b011f85ce39d776e Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sat, 16 May 2020 12:08:27 +0200 Subject: [PATCH] Revert "gesture: only report TypePress for Click gestures if pointer is grabbed" This reverts commit 062e2bc54b109c3ed6b2fa295c4a63aaedcda95d. Reason: delays the press too much for the common case of an embedding List. --- gesture/gesture.go | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/gesture/gesture.go b/gesture/gesture.go index 2db5976d..f078eab4 100644 --- a/gesture/gesture.go +++ b/gesture/gesture.go @@ -36,8 +36,6 @@ type Click struct { // clicks is incremented if successive clicks // are performed within a fixed duration. clicks int - // pressRep tracks whether a TypePress has been reported. - pressRep bool } type ClickState uint8 @@ -142,9 +140,6 @@ func (c *Click) Events(q event.Queue) []ClickEvent { c.clicks = 1 } c.clickedAt = e.Time - if c.reportPress(pointer.Grabbed) { - events = append(events, ClickEvent{Type: TypePress, Position: e.Position, Source: e.Source, Modifiers: e.Modifiers}) - } events = append(events, ClickEvent{Type: TypeClick, Position: e.Position, Source: e.Source, Modifiers: e.Modifiers, NumClicks: c.clicks}) } case pointer.Cancel: @@ -157,10 +152,7 @@ func (c *Click) Events(q event.Queue) []ClickEvent { break } c.state = StatePressed - c.pressRep = false - if c.reportPress(e.Priority) { - events = append(events, ClickEvent{Type: TypePress, Position: e.Position, Source: e.Source, Modifiers: e.Modifiers}) - } + events = append(events, ClickEvent{Type: TypePress, Position: e.Position, Source: e.Source, Modifiers: e.Modifiers}) case pointer.Leave: if c.state == StatePressed { c.state = StateNormal @@ -174,14 +166,6 @@ func (c *Click) Events(q event.Queue) []ClickEvent { return events } -func (c *Click) reportPress(pri pointer.Priority) bool { - send := !c.pressRep && pri == pointer.Grabbed - if send { - c.pressRep = true - } - return send -} - // Add the handler to the operation list to receive scroll events. func (s *Scroll) Add(ops *op.Ops) { oph := pointer.InputOp{Key: s, Grab: s.grab}