Only focus collections on desktop

Fixes fyne-io#4236
lunarforge · Oct 3, 2023 · 674f8cb · 674f8cb
1 parent 6822d1a
commit 674f8cb
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/widget/gridwrap.go b/widget/gridwrap.go
@@ -528,13 +528,16 @@ func (l *gridWrapLayout) setupGridItem(li *gridWrapItem, id GridWrapItemID, focu
 		f(id, li.child)
 	}
 	li.onTapped = func() {
-		l.list.RefreshItem(l.list.currentFocus)
-		canvas := fyne.CurrentApp().Driver().CanvasForObject(l.list)
-		if canvas != nil {
-			canvas.Focus(l.list)
+		if !fyne.CurrentDevice().IsMobile() {
+			l.list.RefreshItem(l.list.currentFocus)
+			canvas := fyne.CurrentApp().Driver().CanvasForObject(l.list)
+			if canvas != nil {
+				canvas.Focus(l.list)
+			}
+
+			l.list.currentFocus = id
 		}
 
-		l.list.currentFocus = id
 		l.list.Select(id)
 	}
 }

diff --git a/widget/list.go b/widget/list.go
@@ -611,12 +611,15 @@ func (l *listLayout) setupListItem(li *listItem, id ListItemID, focus bool) {
 		f(id, li.child)
 	}
 	li.onTapped = func() {
-		canvas := fyne.CurrentApp().Driver().CanvasForObject(l.list)
-		if canvas != nil {
-			canvas.Focus(l.list)
+		if !fyne.CurrentDevice().IsMobile() {
+			canvas := fyne.CurrentApp().Driver().CanvasForObject(l.list)
+			if canvas != nil {
+				canvas.Focus(l.list)
+			}
+
+			l.list.currentFocus = id
 		}
 
-		l.list.currentFocus = id
 		l.list.Select(id)
 	}
 }

diff --git a/widget/table.go b/widget/table.go
@@ -558,13 +558,15 @@ func (t *Table) Tapped(e *fyne.PointEvent) {
 	}
 	t.Select(TableCellID{row, col})
 
-	t.RefreshItem(t.currentFocus)
-	canvas := fyne.CurrentApp().Driver().CanvasForObject(t)
-	if canvas != nil {
-		canvas.Focus(t)
+	if !fyne.CurrentDevice().IsMobile() {
+		t.RefreshItem(t.currentFocus)
+		canvas := fyne.CurrentApp().Driver().CanvasForObject(t)
+		if canvas != nil {
+			canvas.Focus(t)
+		}
+		t.currentFocus = TableCellID{row, col}
+		t.RefreshItem(t.currentFocus)
 	}
-	t.currentFocus = TableCellID{row, col}
-	t.RefreshItem(t.currentFocus)
 }
 
 // columnAt returns a positive integer (or 0) for the column that is found at the `pos` X position.

diff --git a/widget/tree.go b/widget/tree.go
@@ -883,12 +883,14 @@ func (n *treeNode) Tapped(*fyne.PointEvent) {
 	}
 
 	n.tree.Select(n.uid)
-	canvas := fyne.CurrentApp().Driver().CanvasForObject(n.tree)
-	if canvas != nil {
-		canvas.Focus(n.tree)
+	if !fyne.CurrentDevice().IsMobile() {
+		canvas := fyne.CurrentApp().Driver().CanvasForObject(n.tree)
+		if canvas != nil {
+			canvas.Focus(n.tree)
+		}
+		n.tree.currentFocus = n.uid
+		n.Refresh()
 	}
-	n.tree.currentFocus = n.uid
-	n.Refresh()
 }
 
 func (n *treeNode) partialRefresh() {