Skip to content
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

Fix clicking on empty part of widget.List not unfocusing #5314

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Fix clicking on empty part of widget.List not unfocusing #5314

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb78c11
Fixes issue 4770: Clicking on empty part of widget.List does not unfo…
coder-in-go Dec 13, 2024
9a34d2f
Added test case for the fix: 4770
coder-in-go Dec 13, 2024
1e33f9b
Reverted Added test case for the fix: 4770
coder-in-go Dec 18, 2024
8f27762
Revert "Clicking on empty part of widget.List does not unfocus other …
coder-in-go Dec 18, 2024
3b9c451
Fix for clicking on empty part of widget.List not unfocusing
coder-in-go Dec 18, 2024
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
16 changes: 12 additions & 4 deletions internal/driver/glfw/window.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ func (w *window) processMouseClicked(button desktop.MouseButton, action action,

co, pos, _ := w.findObjectAtPositionMatching(w.canvas, mousePos, func(object fyne.CanvasObject) bool {
switch object.(type) {
case fyne.Tappable, fyne.SecondaryTappable, fyne.DoubleTappable, fyne.Focusable, desktop.Mouseable:
case fyne.Tappable, fyne.SecondaryTappable, fyne.DoubleTappable, fyne.Focusable, desktop.Mouseable, desktop.Hoverable:
coder-in-go marked this conversation as resolved.
Show resolved Hide resolved
return true
case fyne.Draggable:
if mouseDragStarted {
Expand Down Expand Up @@ -540,9 +540,11 @@ func (w *window) processMouseClicked(button desktop.MouseButton, action action,
if wid, ok := co.(fyne.Focusable); !ok || wid != w.canvas.Focused() {
ignore := false
_, _, _ = w.findObjectAtPositionMatching(w.canvas, mousePos, func(object fyne.CanvasObject) bool {
switch object.(type) {
case fyne.Focusable:
if focusable, isFocusable := object.(fyne.Focusable); isFocusable {
ignore = true
if focusable != w.canvas.Focused() {
w.canvas.Focus(focusable)
coder-in-go marked this conversation as resolved.
Show resolved Hide resolved
}
return true
}

Expand All @@ -568,6 +570,10 @@ func (w *window) processMouseClicked(button desktop.MouseButton, action action,
mousePressed := w.mousePressed
w.mouseLock.Unlock()

if mousePressed == nil {
w.canvas.Unfocus()
}

if action == release && mouseDragged != nil {
if mouseDragStarted {
w.QueueEvent(mouseDragged.DragEnd)
Expand All @@ -593,7 +599,9 @@ func (w *window) processMouseClicked(button desktop.MouseButton, action action,
} else if action == release {
if co == mousePressed {
if button == desktop.MouseButtonSecondary && altTap {
w.QueueEvent(func() { secondary.TappedSecondary(ev) })
w.QueueEvent(func() {
secondary.TappedSecondary(ev)
})
}
}
}
Expand Down
42 changes: 42 additions & 0 deletions internal/driver/glfw/window_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2061,3 +2061,45 @@ func (t *tabbable) AcceptsTab() bool {
t.acceptTabCallCount++
return true
}

func TestProcessMouseClicked(t *testing.T) {
testApp := test.NewApp()
defer testApp.Quit()

testWin := testApp.NewWindow("Test Window")
defer testWin.Close()

tappable := &mockTappable{}
tappable.Resize(fyne.NewSize(100, 100))
testWin.SetContent(tappable)

test.Tap(tappable)

if !tappable.tapped {
t.Errorf("Expected tappable object to be tapped")
}

focusable := widget.NewEntry()
testWin.SetContent(container.NewVBox(tappable, focusable))

test.Tap(focusable)

testWin.Canvas().Focus(focusable)

if testWin.Canvas().Focused() != focusable {
t.Errorf("Expected focusable object to be focused")
}
}

type mockTappable struct {
widget.BaseWidget
tapped bool
}

func (m *mockTappable) Tapped(_ *fyne.PointEvent) {
m.tapped = true
}

func (m *mockTappable) CreateRenderer() fyne.WidgetRenderer {
return widget.NewSimpleRenderer(widget.NewLabel("Tappable"))
}
2 changes: 2 additions & 0 deletions widget/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ func (l *List) RefreshItem(id ListItemID) {
return
}
l.BaseWidget.Refresh()

l.Unselect(id)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like an unrelated change? Why are the semantics of RefreshItem changing to that you can't use it to refresh a selected item?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • When the entry is focused, the list item should be unfocused, to unfocus the list item we need this

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this code is not allowing an item to remain selected when it is refreshed - so scrolling will lose the selected status

lo := l.scroller.Content.(*fyne.Container).Layout.(*listLayout)
lo.renderLock.RLock() // ensures we are not changing visible info in render code during the search
item, ok := lo.searchVisible(lo.visible, id)
Expand Down
Loading