app,io/pointer: [API] remove CursorNameOp and rename CursorName -> Cursor

It's now possible to directly user pointer.Cursor to add to the ops.

   pointer.CursorText.Add(gtx.Ops)

This is an API change. Use pointer.Cursor directly instead of CursorNameOp.

Signed-off-by: Egon Elbre <egonelbre@gmail.com>
This commit is contained in:
Egon Elbre
2022-02-26 12:54:42 +02:00
committed by Elias Naur
parent 4172566aad
commit cdb288d1f9
18 changed files with 57 additions and 68 deletions
+4 -4
View File
@@ -572,7 +572,7 @@ func TestMultitouch(t *testing.T) {
assertEventPointerTypeSequence(t, r.Events(h2), pointer.Cancel, pointer.Enter, pointer.Press, pointer.Release)
}
func TestCursorNameOp(t *testing.T) {
func TestCursor(t *testing.T) {
ops := new(op.Ops)
var r Router
var h, h2 int
@@ -582,7 +582,7 @@ func TestCursorNameOp(t *testing.T) {
defer clip.Rect(image.Rectangle{Max: image.Pt(100, 100)}).Push(ops).Pop()
// The cursor is checked and changed upon cursor movement.
pointer.InputOp{Tag: &h}.Add(ops)
pointer.CursorNameOp{Name: pointer.CursorPointer}.Add(ops)
pointer.CursorPointer.Add(ops)
if widget2 != nil {
widget2()
}
@@ -605,7 +605,7 @@ func TestCursorNameOp(t *testing.T) {
for _, tc := range []struct {
label string
event interface{}
want pointer.CursorName
want pointer.Cursor
}{
{label: "move inside",
event: _at(50, 50),
@@ -638,7 +638,7 @@ func TestCursorNameOp(t *testing.T) {
event: func() []event.Event {
widget2 = func() {
pointer.InputOp{Tag: &h2}.Add(ops)
pointer.CursorNameOp{Name: pointer.CursorCrosshair}.Add(ops)
pointer.CursorCrosshair.Add(ops)
}
return []event.Event{
_at(50, 50),