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

io/router: avoid extra work when dealing with EnterLeave events

Browse Source 
When computing the set of Enter/Leave events to be
delivered to handlers, skip non mouse pointers
right away instead of processing hit events.

Also, remove use of pointer to slice use in opHit.

Signed-off-by: Pierre Curto <pierre.curto@gmail.com>
This commit is contained in:
Pierre Curto
2021-12-09 21:13:25 +01:00
committed by Elias Naur
parent 038ec2cc3f
commit 294ecfbe9d
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/router/pointer.go
+18 -16
View File
@@ -429,9 +429,10 @@ func (q *pointerQueue) SemanticAt(pos f32.Point) (SemanticID, bool) {
return 0, false return 0, false
} }
func (q *pointerQueue) opHit(handlers *[]event.Tag, pos f32.Point) { func (q *pointerQueue) opHit(pos f32.Point) []event.Tag {
// Track whether we're passing through hits. // Track whether we're passing through hits.
pass := true pass := true
hits := q.scratch[:0]
idx := len(q.hitTree) - 1 idx := len(q.hitTree) - 1
for idx >= 0 { for idx >= 0 {
n := &q.hitTree[idx] n := &q.hitTree[idx]
@@ -448,10 +449,12 @@ func (q *pointerQueue) opHit(handlers *[]event.Tag, pos f32.Point) {
} }
if n.tag != nil { if n.tag != nil {
if _, exists := q.handlers[n.tag]; exists { if _, exists := q.handlers[n.tag]; exists {
*handlers = addHandler(*handlers, n.tag) hits = addHandler(hits, n.tag)
} }
} }
} }
q.scratch = hits[:0]
return hits
} }
func (q *pointerQueue) invTransform(areaIdx int, p f32.Point) f32.Point { func (q *pointerQueue) invTransform(areaIdx int, p f32.Point) f32.Point {
@@ -665,22 +668,21 @@ func (q *pointerQueue) deliverScrollEvent(p *pointerInfo, events *handlerEvents,
} }
func (q *pointerQueue) deliverEnterLeaveEvents(p *pointerInfo, events *handlerEvents, e pointer.Event) { func (q *pointerQueue) deliverEnterLeaveEvents(p *pointerInfo, events *handlerEvents, e pointer.Event) {
q.scratch = q.scratch[:0] var hits []event.Tag
q.opHit(&q.scratch, e.Position)
if p.pressed {
// Filter out non-participating handlers.
for i := len(q.scratch) - 1; i >= 0; i-- {
if _, found := searchTag(p.handlers, q.scratch[i]); !found {
q.scratch = append(q.scratch[:i], q.scratch[i+1:]...)
}
}
} else {
p.handlers = append(p.handlers[:0], q.scratch...)
}
hits := q.scratch
if e.Source != pointer.Mouse && !p.pressed && e.Type != pointer.Press { if e.Source != pointer.Mouse && !p.pressed && e.Type != pointer.Press {
// Consider non-mouse pointers leaving when they're released. // Consider non-mouse pointers leaving when they're released.
hits = nil } else {
hits = q.opHit(e.Position)
if p.pressed {
// Filter out non-participating handlers.
for i := len(hits) - 1; i >= 0; i-- {
if _, found := searchTag(p.handlers, hits[i]); !found {
hits = append(hits[:i], hits[i+1:]...)
}
}
} else {
p.handlers = append(p.handlers[:0], hits...)
}
} }
// Deliver Leave events. // Deliver Leave events.
for _, k := range p.entered { for _, k := range p.entered {