all: use a single tag per widget for event handling

With the introduction of filters, it is now possible to have one tag per
widget by convention. Note that gestures still have their own tags, for
disambiguation.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2023-11-25 14:36:00 -06:00
parent c515b7804e
commit 75314fcee2
4 changed files with 23 additions and 25 deletions
+6 -5
View File
@@ -25,16 +25,17 @@ func TestDraggable(t *testing.T) {
drag := &Draggable{
Type: "file",
}
tgt := new(int)
defer pointer.PassOp{}.Push(gtx.Ops).Pop()
dims := drag.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
return layout.Dimensions{Size: gtx.Constraints.Min}
}, nil)
stack := clip.Rect{Max: dims.Size}.Push(gtx.Ops)
event.InputOp(gtx.Ops, drag)
event.InputOp(gtx.Ops, tgt)
stack.Pop()
drag.Update(gtx)
r.Event(drag, transfer.TargetFilter{Type: drag.Type})
r.Event(tgt, transfer.TargetFilter{Type: drag.Type})
r.Frame(gtx.Ops)
r.Queue(
pointer.Event{
@@ -52,10 +53,10 @@ func TestDraggable(t *testing.T) {
)
ofr := &offer{data: "hello"}
drag.Update(gtx)
r.Event(drag, transfer.TargetFilter{Type: drag.Type})
r.Event(tgt, transfer.TargetFilter{Type: drag.Type})
drag.Offer(gtx, "file", ofr)
e, ok := r.Event(drag, transfer.TargetFilter{Type: drag.Type})
e, ok := r.Event(tgt, transfer.TargetFilter{Type: drag.Type})
if !ok {
t.Fatalf("expected event")
}
@@ -66,7 +67,7 @@ func TestDraggable(t *testing.T) {
if ofr.closed {
t.Error("offer closed prematurely")
}
e, ok = r.Event(drag, transfer.TargetFilter{Type: drag.Type})
e, ok = r.Event(tgt, transfer.TargetFilter{Type: drag.Type})
if !ok {
t.Fatalf("expected event")
}