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

io/pointer,io/router,gesture: add pointer.Foremost priority

Browse Source 
Replace the pointer.Scroll special case with a new priority that
indicates the foremost handler, checked in gesture.Scroll.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-06-05 10:46:19 +02:00
parent 2accb88381
commit 65d4707e3e
4 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/router/pointer.go
+16 -13
View File
@@ -262,29 +262,34 @@ func (q *pointerQueue) Push(e pointer.Event, events *handlerEvents) {
}
func (q *pointerQueue) deliverEvent(p *pointerInfo, events *handlerEvents, e pointer.Event) {
foremost := true
for _, k := range p.handlers {
h := q.handlers[k]
e := e
if p.pressed && len(p.handlers) == 1 {
e.Priority = pointer.Grabbed
} else if foremost {
e.Priority = pointer.Foremost
}
e.Position = h.transform.Invert().Transform(e.Position)
addPointerEvent(events, k, e, h.types)
// Only deliver scroll events to the foremost handler.
if e.Type == pointer.Scroll && e.Type&h.types != 0 {
return
if e.Type&h.types == e.Type {
foremost = false
events.Add(k, e)
}
}
}
func (q *pointerQueue) deliverEnterLeaveEvents(p *pointerInfo, events *handlerEvents, e pointer.Event) {
foremost := true
for _, k := range p.handlers {
h := q.handlers[k]
e := e
if p.pressed && len(p.handlers) == 1 {
e.Priority = pointer.Grabbed
} else if foremost {
e.Priority = pointer.Foremost
}
// Hit-test to deliver Enter/Leave events. Consider non-mouse
@@ -304,18 +309,16 @@ func (q *pointerQueue) deliverEnterLeaveEvents(p *pointerInfo, events *handlerEv
case !hit && entered != -1:
p.entered = append(p.entered[:entered], p.entered[entered+1:]...)
e.Type = pointer.Leave
addPointerEvent(events, k, e, h.types)
case hit && entered == -1:
p.entered = append(p.entered, k)
e.Type = pointer.Enter
addPointerEvent(events, k, e, h.types)
default:
continue
}
if e.Type&h.types == e.Type {
foremost = false
events.Add(k, e)
}
}
}
func addPointerEvent(events *handlerEvents, k event.Tag, e pointer.Event, types pointer.Type) {
if e.Type&types == e.Type {
events.Add(k, e)
}
}