io/router: fix Enter/Leave during press events

This commit updates the implementation of the Enter/Leave pointer
events so that it no longer shares any state with the processing
of pointer presses and grabs. This simplifies the implementation,
though it does leave a certain amount of structural redundancy.

Signed-off-by: Chris Waldon <christopher.waldon.dev@gmail.com>
This commit is contained in:
Chris Waldon
2020-05-06 22:25:58 -04:00
committed by Elias Naur
parent c1f0f9b5c7
commit 29a9e5bc27
+15 -3
View File
@@ -21,6 +21,10 @@ type pointerQueue struct {
pointers []pointerInfo
reader ops.Reader
scratch []event.Key
// prev and curr are two additional scratch slices that track active
// pointer event handlers from the previous and current frame
prev, curr []event.Key
}
type hitNode struct {
@@ -135,6 +139,9 @@ func (q *pointerQueue) opHit(handlers *[]event.Key, pos f32.Point) {
}
}
// TODO(whereswaldon): This method fails to handle the case in which a child
// hit area extends outside of the boundaries of its parent. Such child hit
// areas will not recieve some events as a result.
func (q *pointerQueue) hit(areaIdx int, p f32.Point) bool {
for areaIdx != -1 {
a := &q.areas[areaIdx]
@@ -237,8 +244,10 @@ func (q *pointerQueue) Push(e pointer.Event, events *handlerEvents) {
}
// Deliver enter and leave events for pointers that entered or left a hit area.
q.deliverEventsToMissingHandlers(q.scratch, p.handlers, pointer.Enter, e, events)
q.deliverEventsToMissingHandlers(p.handlers, q.scratch, pointer.Leave, e, events)
q.curr, q.prev = q.prev[:0], q.curr
q.opHit(&q.curr, e.Position)
q.deliverEventsToMissingHandlers(q.prev, q.curr, pointer.Enter, e, events)
q.deliverEventsToMissingHandlers(q.curr, q.prev, pointer.Leave, e, events)
for _, k := range p.handlers {
h := q.handlers[k]
@@ -278,7 +287,10 @@ func (q *pointerQueue) deliverEventsToMissingHandlers(a, b []event.Key, evType p
}
}
if !found {
h := q.handlers[newH]
h, ok := q.handlers[newH]
if !ok {
continue
}
ev := evTemplate
ev.Hit = q.hit(h.area, evTemplate.Position)
ev.Position = h.transform.Invert().Transform(evTemplate.Position)