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

Jump to bottom

Focus selects when tapped #4803

Merged
merged 8 commits into from
May 6, 2024
Merged

Focus selects when tapped #4803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b546ad6
Move this common code to a single method
andydotxyz Apr 22, 2024
623185a
Focus the select when tapped if not mobile (like the other widgets)
andydotxyz Apr 22, 2024
45fed04
Don't test desktop behaviour on mobile
andydotxyz Apr 22, 2024
80b9776
Update the XML for the changed focus state after select tap
andydotxyz Apr 22, 2024
be86cb7
Update images too
andydotxyz Apr 22, 2024
b974d0f
Merge branch 'develop' into fix/4767
andydotxyz May 5, 2024
af02c89
Split test files between mobile and desktop
andydotxyz May 5, 2024
375d165
Remove trailing newline
andydotxyz May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions widget/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,8 @@ func (c *Check) Tapped(pe *fyne.PointEvent) {
return
}

if !c.focused && !fyne.CurrentDevice().IsMobile() {
impl := c.super()

if c := fyne.CurrentApp().Driver().CanvasForObject(impl); c != nil {
c.Focus(impl.(fyne.Focusable))
}
if !c.focused {
focusIfNotMobile(c.super())
}
c.SetChecked(!c.Checked)
}
Expand Down Expand Up @@ -382,3 +378,12 @@ func (c *checkRenderer) updateFocusIndicator(th fyne.Theme, v fyne.ThemeVariant)
c.focusIndicator.FillColor = color.Transparent
}
}

func focusIfNotMobile(w fyne.Widget) {
if !fyne.CurrentDevice().IsMobile() {
if c := fyne.CurrentApp().Driver().CanvasForObject(w); c != nil {
c.Focus(w.(fyne.Focusable))
}
}

}
8 changes: 2 additions & 6 deletions widget/radio_item.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,8 @@ func (i *radioItem) SetSelected(selected bool) {
//
// Implements: fyne.Tappable
func (i *radioItem) Tapped(_ *fyne.PointEvent) {
if !i.focused && !fyne.CurrentDevice().IsMobile() {
impl := i.super()

if c := fyne.CurrentApp().Driver().CanvasForObject(impl); c != nil {
c.Focus(impl.(fyne.Focusable))
}
if !i.focused {
focusIfNotMobile(i.super())
}
i.toggle()
}
Expand Down
4 changes: 4 additions & 0 deletions widget/select.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ func (s *Select) Tapped(*fyne.PointEvent) {
return
}

if !s.focused {
focusIfNotMobile(s.super())
}

s.tapAnimation()
s.Refresh()

Expand Down
9 changes: 7 additions & 2 deletions widget/select_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,16 @@ func TestSelectRenderer_TapAnimation(t *testing.T) {
sel.Resize(sel.MinSize())
sel.Refresh()

path := "select/desktop/tap_animation.png"
if fyne.CurrentDevice().IsMobile() {
path = "select/mobile/tap_animation.png"
}

render1 := test.WidgetRenderer(sel).(*selectRenderer)
test.Tap(sel)
sel.popUp.Hide()
sel.tapAnim.Tick(0.5)
test.AssertImageMatches(t, "select/tap_animation.png", w.Canvas().Capture())
test.AssertImageMatches(t, path, w.Canvas().Capture())

cache.DestroyRenderer(sel)
sel.Refresh()
Expand All @@ -63,5 +68,5 @@ func TestSelectRenderer_TapAnimation(t *testing.T) {
test.Tap(sel)
sel.popUp.Hide()
sel.tapAnim.Tick(0.5)
test.AssertImageMatches(t, "select/tap_animation.png", w.Canvas().Capture())
test.AssertImageMatches(t, path, w.Canvas().Capture())
}
40 changes: 31 additions & 9 deletions widget/select_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package widget_test

import (
"fmt"
"image"
"testing"
"time"

Expand Down Expand Up @@ -35,11 +37,11 @@ func TestSelect_Align(t *testing.T) {
c := fyne.CurrentApp().Driver().CanvasForObject(sel)

test.Tap(sel)
test.AssertRendersToMarkup(t, "select/center.xml", c)
assertRendersToPlatformMarkup(t, "select/%s/center.xml", c)

sel.Alignment = fyne.TextAlignTrailing
sel.Refresh()
test.AssertRendersToMarkup(t, "select/trailing.xml", c)
assertRendersToPlatformMarkup(t, "select/%s/trailing.xml", c)
}

func TestSelect_ChangeTheme(t *testing.T) {
Expand All @@ -54,13 +56,13 @@ func TestSelect_ChangeTheme(t *testing.T) {
combo.Move(fyne.NewPos(10, 10))
test.Tap(combo)

test.AssertImageMatches(t, "select/theme_initial.png", w.Canvas().Capture())
assertImageMatchesPlatform(t, "select/%s/theme_initial.png", w.Canvas().Capture())

test.WithTestTheme(t, func() {
combo.Resize(combo.MinSize())
combo.Refresh()
time.Sleep(100 * time.Millisecond)
test.AssertImageMatches(t, "select/theme_changed.png", w.Canvas().Capture())
assertImageMatchesPlatform(t, "select/%s/theme_changed.png", w.Canvas().Capture())
})
}

Expand Down Expand Up @@ -295,10 +297,10 @@ func TestSelect_Move(t *testing.T) {
test.AssertRendersToMarkup(t, "select/move_initial.xml", w.Canvas())

combo.Tapped(&fyne.PointEvent{})
test.AssertRendersToMarkup(t, "select/move_tapped.xml", w.Canvas())
assertRendersToPlatformMarkup(t, "select/%s/move_tapped.xml", w.Canvas())

combo.Move(fyne.NewPos(20, 20))
test.AssertRendersToMarkup(t, "select/move_moved.xml", w.Canvas())
assertRendersToPlatformMarkup(t, "select/%s/move_moved.xml", w.Canvas())
}

func TestSelect_PlaceHolder(t *testing.T) {
Expand Down Expand Up @@ -427,7 +429,7 @@ func TestSelect_Tapped(t *testing.T) {
test.Tap(combo)
canvas := fyne.CurrentApp().Driver().CanvasForObject(combo)
assert.Equal(t, 1, len(canvas.Overlays().List()))
test.AssertRendersToMarkup(t, "select/tapped.xml", w.Canvas())
assertRendersToPlatformMarkup(t, "select/%s/tapped.xml", w.Canvas())
}

func TestSelect_Tapped_Constrained(t *testing.T) {
Expand All @@ -444,7 +446,7 @@ func TestSelect_Tapped_Constrained(t *testing.T) {
combo.Move(fyne.NewPos(canvas.Size().Width-10, canvas.Size().Height-10))
test.Tap(combo)
assert.Equal(t, 1, len(canvas.Overlays().List()))
test.AssertRendersToMarkup(t, "select/tapped_constrained.xml", w.Canvas())
assertRendersToPlatformMarkup(t, "select/%s/tapped_constrained.xml", w.Canvas())
}

func TestSelect_Layout(t *testing.T) {
Expand Down Expand Up @@ -554,9 +556,29 @@ func TestSelect_Layout(t *testing.T) {
}
window.Resize(combo.MinSize().Max(fyne.NewSize(150, 200)))

test.AssertRendersToMarkup(t, "select/layout_"+name+".xml", window.Canvas())
assertRendersToPlatformMarkup(t, "select/%s/layout_"+name+".xml", window.Canvas())

window.Close()
})
}
}

func assertRendersToPlatformMarkup(t *testing.T, file string, c fyne.Canvas) {
platform := "desktop"
if fyne.CurrentDevice().IsMobile() {
platform = "mobile"
}

path := fmt.Sprintf(file, platform)
test.AssertRendersToMarkup(t, path, c)
}

func assertImageMatchesPlatform(t *testing.T, file string, i image.Image) {
platform := "desktop"
if fyne.CurrentDevice().IsMobile() {
platform = "mobile"
}

path := fmt.Sprintf(file, platform)
test.AssertImageMatches(t, path, i)
}
9 changes: 2 additions & 7 deletions widget/slider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,8 @@ func (s *Slider) Tapped(e *fyne.PointEvent) {
return
}

driver := fyne.CurrentApp().Driver()
if !s.focused && !driver.Device().IsMobile() {
impl := s.super()

if c := driver.CanvasForObject(impl); c != nil {
c.Focus(impl.(fyne.Focusable))
}
if !s.focused {
focusIfNotMobile(s.super())
}

ratio := s.getRatio(e)
Expand Down
13 changes: 12 additions & 1 deletion widget/slider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,20 @@ func TestSlider_SetValue(t *testing.T) {
assert.Equal(t, 2.0, slider.Value)
}

func TestSlider_FocusDesktop(t *testing.T) {
if fyne.CurrentDevice().IsMobile() {
return
}
slider := NewSlider(0, 10)
win := test.NewWindow(slider)
test.Tap(slider)

assert.Equal(t, win.Canvas().Focused(), slider)
assert.True(t, slider.focused)
}

func TestSlider_Focus(t *testing.T) {
slider := NewSlider(0, 5)

slider.FocusGained()
assert.True(t, slider.focused)

Expand Down
42 changes: 42 additions & 0 deletions widget/testdata/select/desktop/center.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<canvas padded size="200x150">
<content>
<container pos="4,4" size="192x142">
<widget pos="32,53" size="127x35" type="*widget.Select">
<rectangle fillColor="focus" radius="4" size="127x35"/>
<rectangle size="127x35"/>
<widget pos="4,4" size="95x27" type="*widget.RichText">
<text alignment="center" pos="10,4" size="75x19">(Select one)</text>
</widget>
<widget pos="99,7" size="20x20" type="*widget.Icon">
<image fillMode="contain" rsc="menuDropDownIcon" size="iconInlineSize" themed="foreground"/>
</widget>
</widget>
</container>
</content>
<overlay>
<widget size="200x150" type="*widget.OverlayContainer">
<widget pos="36,90" size="127x35" type="*widget.PopUpMenu">
<widget size="127x35" type="*widget.Shadow">
<radialGradient centerOffset="0.5,0.5" pos="-4,-4" size="4x4" startColor="shadow"/>
<linearGradient endColor="shadow" pos="0,-4" size="127x4"/>
<radialGradient centerOffset="-0.5,0.5" pos="127,-4" size="4x4" startColor="shadow"/>
<linearGradient angle="270" pos="127,0" size="4x35" startColor="shadow"/>
<radialGradient centerOffset="-0.5,-0.5" pos="127,35" size="4x4" startColor="shadow"/>
<linearGradient pos="0,35" size="127x4" startColor="shadow"/>
<radialGradient centerOffset="0.5,-0.5" pos="-4,35" size="4x4" startColor="shadow"/>
<linearGradient angle="270" endColor="shadow" pos="-4,0" size="4x35"/>
</widget>
<widget size="127x35" type="*widget.Scroll">
<widget size="127x35" type="*widget.menuBox">
<rectangle fillColor="menuBackground" size="127x35"/>
<container size="127x35">
<widget size="127x35" type="*widget.menuItem">
<text alignment="center" pos="8,8" size="111x19">Hi</text>
</widget>
</container>
</widget>
</widget>
</widget>
</widget>
</overlay>
</canvas>
0 widget/testdata/select/layout_empty.xml → .../testdata/select/desktop/layout_empty.xml
View file
Open in desktop
File renamed without changes.
39 changes: 39 additions & 0 deletions widget/testdata/select/desktop/layout_empty_expanded.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<canvas padded size="150x200">
<content>
<container pos="4,4" size="142x192">
<widget pos="7,78" size="127x35" type="*widget.Select">
<rectangle fillColor="focus" radius="4" size="127x35"/>
<rectangle size="127x35"/>
<widget pos="4,4" size="95x27" type="*widget.RichText">
<text pos="4,4" size="75x19">(Select one)</text>
</widget>
<widget pos="99,7" size="20x20" type="*widget.Icon">
<image fillMode="contain" rsc="menuDropDownIcon" size="iconInlineSize" themed="foreground"/>
</widget>
</widget>
</container>
</content>
<overlay>
<widget size="150x200" type="*widget.OverlayContainer">
<widget pos="11,115" size="127x0" type="*widget.PopUpMenu">
<widget size="127x0" type="*widget.Shadow">
<radialGradient centerOffset="0.5,0.5" pos="-4,-4" size="4x4" startColor="shadow"/>
<linearGradient endColor="shadow" pos="0,-4" size="127x4"/>
<radialGradient centerOffset="-0.5,0.5" pos="127,-4" size="4x4" startColor="shadow"/>
<linearGradient angle="270" pos="127,0" size="4x0" startColor="shadow"/>
<radialGradient centerOffset="-0.5,-0.5" pos="127,0" size="4x4" startColor="shadow"/>
<linearGradient size="127x4" startColor="shadow"/>
<radialGradient centerOffset="0.5,-0.5" pos="-4,0" size="4x4" startColor="shadow"/>
<linearGradient angle="270" endColor="shadow" pos="-4,0" size="4x0"/>
</widget>
<widget size="127x0" type="*widget.Scroll">
<widget size="127x0" type="*widget.menuBox">
<rectangle fillColor="menuBackground" size="127x0"/>
<container size="127x0">
</container>
</widget>
</widget>
</widget>
</widget>
</overlay>
</canvas>
39 changes: 39 additions & 0 deletions widget/testdata/select/desktop/layout_empty_expanded_placeholder.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<canvas padded size="150x200">
<content>
<container pos="4,4" size="142x192">
<widget pos="21,78" size="98x35" type="*widget.Select">
<rectangle fillColor="focus" radius="4" size="98x35"/>
<rectangle size="98x35"/>
<widget pos="4,4" size="66x27" type="*widget.RichText">
<text pos="4,4" size="46x19">(Pick 1)</text>
</widget>
<widget pos="70,7" size="20x20" type="*widget.Icon">
<image fillMode="contain" rsc="menuDropDownIcon" size="iconInlineSize" themed="foreground"/>
</widget>
</widget>
</container>
</content>
<overlay>
<widget size="150x200" type="*widget.OverlayContainer">
<widget pos="25,115" size="98x0" type="*widget.PopUpMenu">
<widget size="98x0" type="*widget.Shadow">
<radialGradient centerOffset="0.5,0.5" pos="-4,-4" size="4x4" startColor="shadow"/>
<linearGradient endColor="shadow" pos="0,-4" size="98x4"/>
<radialGradient centerOffset="-0.5,0.5" pos="98,-4" size="4x4" startColor="shadow"/>
<linearGradient angle="270" pos="98,0" size="4x0" startColor="shadow"/>
<radialGradient centerOffset="-0.5,-0.5" pos="98,0" size="4x4" startColor="shadow"/>
<linearGradient size="98x4" startColor="shadow"/>
<radialGradient centerOffset="0.5,-0.5" pos="-4,0" size="4x4" startColor="shadow"/>
<linearGradient angle="270" endColor="shadow" pos="-4,0" size="4x0"/>
</widget>
<widget size="98x0" type="*widget.Scroll">
<widget size="98x0" type="*widget.menuBox">
<rectangle fillColor="menuBackground" size="98x0"/>
<container size="98x0">
</container>
</widget>
</widget>
</widget>
</widget>
</overlay>
</canvas>
0 ...tdata/select/layout_empty_placeholder.xml → ...lect/desktop/layout_empty_placeholder.xml
View file
Open in desktop
File renamed without changes.
0 widget/testdata/select/layout_multiple.xml → ...stdata/select/desktop/layout_multiple.xml
View file
Open in desktop
File renamed without changes.
45 changes: 45 additions & 0 deletions widget/testdata/select/desktop/layout_multiple_expanded.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<canvas padded size="150x200">
<content>
<container pos="4,4" size="142x192">
<widget pos="7,78" size="127x35" type="*widget.Select">
<rectangle fillColor="focus" radius="4" size="127x35"/>
<rectangle size="127x35"/>
<widget pos="4,4" size="95x27" type="*widget.RichText">
<text pos="4,4" size="75x19">(Select one)</text>
</widget>
<widget pos="99,7" size="20x20" type="*widget.Icon">
<image fillMode="contain" rsc="menuDropDownIcon" size="iconInlineSize" themed="foreground"/>
</widget>
</widget>
</container>
</content>
<overlay>
<widget size="150x200" type="*widget.OverlayContainer">
<widget pos="11,115" size="127x74" type="*widget.PopUpMenu">
<widget size="127x74" type="*widget.Shadow">
<radialGradient centerOffset="0.5,0.5" pos="-4,-4" size="4x4" startColor="shadow"/>
<linearGradient endColor="shadow" pos="0,-4" size="127x4"/>
<radialGradient centerOffset="-0.5,0.5" pos="127,-4" size="4x4" startColor="shadow"/>
<linearGradient angle="270" pos="127,0" size="4x74" startColor="shadow"/>
<radialGradient centerOffset="-0.5,-0.5" pos="127,74" size="4x4" startColor="shadow"/>
<linearGradient pos="0,74" size="127x4" startColor="shadow"/>
<radialGradient centerOffset="0.5,-0.5" pos="-4,74" size="4x4" startColor="shadow"/>
<linearGradient angle="270" endColor="shadow" pos="-4,0" size="4x74"/>
</widget>
<widget size="127x74" type="*widget.Scroll">
<widget size="127x74" type="*widget.menuBox">
<rectangle fillColor="menuBackground" size="127x74"/>
<container size="127x74">
<widget size="127x35" type="*widget.menuItem">
<text pos="8,8" size="111x19">Foo</text>
</widget>
<widget pos="0,39" size="127x35" type="*widget.menuItem">
<text pos="8,8" size="111x19">Bar</text>
</widget>
</container>
</widget>
</widget>
</widget>
</widget>
</overlay>
</canvas>