Skip to content

mobile: Keep selection on tap and hold #6208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MaxGyver83 wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

mobile: Keep selection on tap and hold #6208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions internal/driver/mobile/canvas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,30 +227,6 @@ func (c *canvas) tapDown(pos fyne.Position, tapID int) {
c.lastTapDown[tapID] = time.Now()
c.lastTapDownPos[tapID] = pos
c.dragging = nil

co, objPos, layer := c.findObjectAtPositionMatching(pos, func(object fyne.CanvasObject) bool {
switch object.(type) {
case mobile.Touchable, fyne.Focusable:
return true
}

return false
})

if wid, ok := co.(mobile.Touchable); ok {
touchEv := &mobile.TouchEvent{}
touchEv.ID = tapID
touchEv.Position = objPos
touchEv.AbsolutePosition = pos
wid.TouchDown(touchEv)
c.touched[tapID] = wid
}

if layer != 1 { // 0 - overlay, 1 - window head / menu, 2 - content
if wid, ok := co.(fyne.Focusable); !ok || wid != c.Focused() {
c.Unfocus()
}
}
}

func (c *canvas) tapMove(pos fyne.Position, tapID int,
Expand Down Expand Up @@ -347,12 +323,11 @@ func (c *canvas) tapUp(pos fyne.Position, tapID int,
return false
})

if wid, ok := co.(mobile.Touchable); ok {
if _, ok := co.(mobile.Touchable); ok {
touchEv := &mobile.TouchEvent{}
touchEv.ID = tapID
touchEv.Position = objPos
touchEv.AbsolutePosition = pos
wid.TouchUp(touchEv)
c.touched[tapID] = nil
}

Expand Down
10 changes: 5 additions & 5 deletions internal/driver/mobile/canvas_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,20 +254,20 @@ func Test_canvas_Tappable(t *testing.T) {
content.Resize(fyne.NewSize(24, 24))

c.tapDown(fyne.NewPos(15, 15), 0)
assert.True(t, content.down)
assert.False(t, content.down)

c.tapUp(fyne.NewPos(15, 15), 0, func(wid fyne.Tappable, ev *fyne.PointEvent) {
}, func(wid fyne.SecondaryTappable, ev *fyne.PointEvent) {
}, func(wid fyne.DoubleTappable, ev *fyne.PointEvent) {
}, func(wid fyne.Draggable, ev *fyne.DragEvent) {
})
assert.True(t, content.up)
assert.False(t, content.down)

c.tapDown(fyne.NewPos(15, 15), 0)
c.tapMove(fyne.NewPos(35, 15), 0, func(wid fyne.Draggable, ev *fyne.DragEvent) {
wid.Dragged(ev)
})
assert.True(t, content.cancel)
assert.False(t, content.cancel)
}

func Test_canvas_TouchID(t *testing.T) {
Expand All @@ -284,15 +284,15 @@ func Test_canvas_TouchID(t *testing.T) {
}, func(wid fyne.DoubleTappable, ev *fyne.PointEvent) {
}, func(wid fyne.Draggable, ev *fyne.DragEvent) {
})
assert.True(t, content.ids[0])
assert.False(t, content.ids[0])

c.tapDown(fyne.NewPos(15, 15), 1)
c.tapUp(fyne.NewPos(15, 15), 1, func(wid fyne.Tappable, ev *fyne.PointEvent) {
}, func(wid fyne.SecondaryTappable, ev *fyne.PointEvent) {
}, func(wid fyne.DoubleTappable, ev *fyne.PointEvent) {
}, func(wid fyne.Draggable, ev *fyne.DragEvent) {
})
assert.True(t, content.ids[1])
assert.False(t, content.ids[1])
}

func Test_canvas_Tapped(t *testing.T) {
Expand Down
Loading