joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-05 17:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

io/router: don't send pointer.Cancel events to disappearing handlers

Browse Source 
As a follow-up to gioui.org/commit/24f69bf4, this change makes it so
that merely adding a pointer.InputOp doesn't trigger redraws when
the pointer is hovered over its area.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-01-23 12:00:50 +01:00
parent 84b586ae6c
commit cc63a3aeb7
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/router/pointer.go
+12 -4
View File
@@ -205,7 +205,7 @@ func (q *pointerQueue) hit(areaIdx int, p f32.Point) bool {
return true return true
} }
func (q *pointerQueue) init() { func (q *pointerQueue) reset() {
if q.handlers == nil { if q.handlers == nil {
q.handlers = make(map[event.Tag]*pointerHandler) q.handlers = make(map[event.Tag]*pointerHandler)
} }
@@ -213,7 +213,7 @@ func (q *pointerQueue) init() {
} }
func (q *pointerQueue) Frame(root *op.Ops, events *handlerEvents) { func (q *pointerQueue) Frame(root *op.Ops, events *handlerEvents) {
q.init() q.reset()
for _, h := range q.handlers { for _, h := range q.handlers {
// Reset handler. // Reset handler.
h.active = false h.active = false
@@ -238,6 +238,8 @@ func (q *pointerQueue) Frame(root *op.Ops, events *handlerEvents) {
for i, k2 := range p.handlers { for i, k2 := range p.handlers {
if k2 == k { if k2 == k {
// Drop other handlers that lost their grab. // Drop other handlers that lost their grab.
cancelHandlers(events, p.handlers[i+1:]...)
cancelHandlers(events, p.handlers[:i]...)
q.dropHandlers(events, p.handlers[i+1:]...) q.dropHandlers(events, p.handlers[i+1:]...)
q.dropHandlers(events, p.handlers[:i]...) q.dropHandlers(events, p.handlers[:i]...)
break break
@@ -248,9 +250,14 @@ func (q *pointerQueue) Frame(root *op.Ops, events *handlerEvents) {
} }
} }
func (q *pointerQueue) dropHandlers(events *handlerEvents, tags ...event.Tag) { func cancelHandlers(events *handlerEvents, tags ...event.Tag) {
for _, k := range tags { for _, k := range tags {
events.Add(k, pointer.Event{Type: pointer.Cancel}) events.Add(k, pointer.Event{Type: pointer.Cancel})
}
}
func (q *pointerQueue) dropHandlers(events *handlerEvents, tags ...event.Tag) {
for _, k := range tags {
for i := range q.pointers { for i := range q.pointers {
p := &q.pointers[i] p := &q.pointers[i]
for i := len(p.handlers) - 1; i >= 0; i-- { for i := len(p.handlers) - 1; i >= 0; i-- {
@@ -268,10 +275,11 @@ func (q *pointerQueue) dropHandlers(events *handlerEvents, tags ...event.Tag) {
} }
func (q *pointerQueue) Push(e pointer.Event, events *handlerEvents) { func (q *pointerQueue) Push(e pointer.Event, events *handlerEvents) {
q.init() q.reset()
if e.Type == pointer.Cancel { if e.Type == pointer.Cancel {
q.pointers = q.pointers[:0] q.pointers = q.pointers[:0]
for k := range q.handlers { for k := range q.handlers {
cancelHandlers(events, k)
q.dropHandlers(events, k) q.dropHandlers(events, k)
} }
return return
io/router/pointer_test.go
+6 -3
View File
@@ -89,9 +89,12 @@ func TestPointerMove(t *testing.T) {
Type: pointer.Move, Type: pointer.Move,
Position: f32.Pt(100, 50), Position: f32.Pt(100, 50),
}, },
pointer.Event{
Type: pointer.Cancel,
},
) )
assertEventSequence(t, r.Events(handler1), pointer.Cancel, pointer.Enter, pointer.Move, pointer.Move, pointer.Leave) assertEventSequence(t, r.Events(handler1), pointer.Cancel, pointer.Enter, pointer.Move, pointer.Move, pointer.Leave, pointer.Cancel)
assertEventSequence(t, r.Events(handler2), pointer.Cancel, pointer.Enter, pointer.Move, pointer.Leave) assertEventSequence(t, r.Events(handler2), pointer.Cancel, pointer.Enter, pointer.Move, pointer.Leave, pointer.Cancel)
} }
func TestPointerTypes(t *testing.T) { func TestPointerTypes(t *testing.T) {
@@ -396,7 +399,7 @@ func TestPointerActiveInputDisappears(t *testing.T) {
Position: f32.Pt(25, 25), Position: f32.Pt(25, 25),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Cancel) assertEventSequence(t, r.Events(handler1))
} }
func TestMultitouch(t *testing.T) { func TestMultitouch(t *testing.T) {