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

io/input: remove dependency on package gesture

Browse Source 
This change is required to to replace event.Queue with a concrete
input.Source.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2023-10-08 18:09:41 -05:00
parent 4fcd96ac4b
commit c319f3c214
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/input/pointer_test.go
+14 -9
View File
@@ -10,7 +10,6 @@ import (
"testing" "testing"
"gioui.org/f32" "gioui.org/f32"
"gioui.org/gesture"
"gioui.org/io/event" "gioui.org/io/event"
"gioui.org/io/key" "gioui.org/io/key"
"gioui.org/io/pointer" "gioui.org/io/pointer"
@@ -1036,10 +1035,13 @@ func TestTransfer(t *testing.T) {
t.Run("valid target enter/leave events", func(t *testing.T) { t.Run("valid target enter/leave events", func(t *testing.T) {
ops := new(op.Ops) ops := new(op.Ops)
src, _ := setup(ops, "file", "file") src, _ := setup(ops, "file", "file")
var hover gesture.Hover
pass := pointer.PassOp{}.Push(ops) pass := pointer.PassOp{}.Push(ops)
stack := clip.Rect(tgtArea).Push(ops) stack := clip.Rect(tgtArea).Push(ops)
hover.Add(ops) tag := new(int)
pointer.InputOp{
Tag: tag,
Kinds: pointer.Enter | pointer.Leave,
}.Add(ops)
stack.Pop() stack.Pop()
pass.Pop() pass.Pop()
@@ -1060,7 +1062,7 @@ func TestTransfer(t *testing.T) {
Kind: pointer.Move, Kind: pointer.Move,
}, },
) )
assertEventPointerTypeSequence(t, r.Events(&hover), pointer.Cancel, pointer.Enter) assertEventPointerTypeSequence(t, r.Events(tag), pointer.Cancel, pointer.Enter)
// Drop. // Drop.
r.Queue( r.Queue(
@@ -1078,16 +1080,19 @@ func TestTransfer(t *testing.T) {
Data: ofr, Data: ofr,
}.Add(ops) }.Add(ops)
r.Frame(ops) r.Frame(ops)
assertEventPointerTypeSequence(t, r.Events(&hover), pointer.Leave) assertEventPointerTypeSequence(t, r.Events(tag), pointer.Leave)
}) })
t.Run("invalid target NO enter/leave events", func(t *testing.T) { t.Run("invalid target NO enter/leave events", func(t *testing.T) {
ops := new(op.Ops) ops := new(op.Ops)
src, _ := setup(ops, "file", "nofile") src, _ := setup(ops, "file", "nofile")
var hover gesture.Hover
pass := pointer.PassOp{}.Push(ops) pass := pointer.PassOp{}.Push(ops)
stack := clip.Rect(tgtArea).Push(ops) stack := clip.Rect(tgtArea).Push(ops)
hover.Add(ops) tag := new(int)
pointer.InputOp{
Tag: tag,
Kinds: pointer.Enter | pointer.Leave,
}.Add(ops)
stack.Pop() stack.Pop()
pass.Pop() pass.Pop()
@@ -1108,7 +1113,7 @@ func TestTransfer(t *testing.T) {
Kind: pointer.Move, Kind: pointer.Move,
}, },
) )
assertEventPointerTypeSequence(t, r.Events(&hover), pointer.Cancel) assertEventPointerTypeSequence(t, r.Events(tag), pointer.Cancel)
// Drop. // Drop.
r.Queue( r.Queue(
@@ -1126,7 +1131,7 @@ func TestTransfer(t *testing.T) {
Data: ofr, Data: ofr,
}.Add(ops) }.Add(ops)
r.Frame(ops) r.Frame(ops)
assertEventPointerTypeSequence(t, r.Events(&hover), pointer.Leave) assertEventPointerTypeSequence(t, r.Events(tag), pointer.Leave)
}) })
} }