From daac2c85668933fd863cd9945122dbe05b00cf34 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Thu, 22 Feb 2024 17:25:46 -0800 Subject: [PATCH] fix keyboard scrolling weirdness by updating Fyne fork --- go.mod | 2 +- go.sum | 4 ++-- ui/browsing/artistpage.go | 1 - ui/browsing/artistspage.go | 1 - ui/browsing/favoritespage.go | 1 - ui/browsing/genrespage.go | 1 - ui/browsing/gridviewpage.go | 1 - ui/browsing/playlistspage.go | 2 -- ui/widgets/gridview.go | 1 - ui/widgets/tracklist.go | 1 - 10 files changed, 3 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 45ca4ca..a4fddb6 100644 --- a/go.mod +++ b/go.mod @@ -47,4 +47,4 @@ require ( honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2 // indirect ) -replace fyne.io/fyne/v2 v2.4.4 => github.com/dweymouth/fyne/v2 v2.3.0-rc1.0.20240218203813-b7a35021b57b +replace fyne.io/fyne/v2 v2.4.4 => github.com/dweymouth/fyne/v2 v2.3.0-rc1.0.20240223011653-8ae51d5989c7 diff --git a/go.sum b/go.sum index 7cfb14a..f482185 100644 --- a/go.sum +++ b/go.sum @@ -69,8 +69,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/deluan/sanitize v0.0.0-20230310221930-6e18967d9fc1 h1:mGvOb3zxl4vCLv+dbf7JA6CAaM2UH/AGP1KX4DsJmTI= github.com/deluan/sanitize v0.0.0-20230310221930-6e18967d9fc1/go.mod h1:ZNCLJfehvEf34B7BbLKjgpsL9lyW7q938w/GY1XgV4E= -github.com/dweymouth/fyne/v2 v2.3.0-rc1.0.20240218203813-b7a35021b57b h1:OTAeOqbaclUzdfx5iZY3lZrABgCI8sAOWedfW6Uasgs= -github.com/dweymouth/fyne/v2 v2.3.0-rc1.0.20240218203813-b7a35021b57b/go.mod h1:VyrxAOZ3NRZRWBvNIJbfqoKOG4DdbewoPk7ozqJKNPY= +github.com/dweymouth/fyne/v2 v2.3.0-rc1.0.20240223011653-8ae51d5989c7 h1:FzqYP/hyJTfSeajLyY/sB4SpQM9X+/FuFxnT4RgVYYg= +github.com/dweymouth/fyne/v2 v2.3.0-rc1.0.20240223011653-8ae51d5989c7/go.mod h1:VyrxAOZ3NRZRWBvNIJbfqoKOG4DdbewoPk7ozqJKNPY= github.com/dweymouth/go-jellyfin v0.0.0-20231116161116-e800860bdacc h1:wJy4U12Ys5Jgt08dgh5AW4suRZgKTwI1PUEmDu8aOmY= github.com/dweymouth/go-jellyfin v0.0.0-20231116161116-e800860bdacc/go.mod h1:BMwS4vdjEYf1gmjPGSKCzWP/I6YlI6fkefJ9nsjBjaU= github.com/dweymouth/go-mpv v0.0.0-20230406003141-7f1858e503ee h1:ZGyJ6wp7CAfT31BugypcF/TPKEy2RrGR9JFq1JOjOpY= diff --git a/ui/browsing/artistpage.go b/ui/browsing/artistpage.go index 4f67e57..333387b 100644 --- a/ui/browsing/artistpage.go +++ b/ui/browsing/artistpage.go @@ -153,7 +153,6 @@ var _ Scrollable = (*ArtistPage)(nil) func (g *ArtistPage) Scroll(scrollAmt float32) { if g.activeView == 0 && g.albumGrid != nil { g.albumGrid.ScrollToOffset(g.albumGrid.GetScrollOffset() + scrollAmt) - g.albumGrid.Refresh() } } diff --git a/ui/browsing/artistspage.go b/ui/browsing/artistspage.go index ad10493..dc8ae58 100644 --- a/ui/browsing/artistspage.go +++ b/ui/browsing/artistspage.go @@ -168,7 +168,6 @@ var _ Scrollable = (*ArtistsPage)(nil) func (a *ArtistsPage) Scroll(scrollAmt float32) { a.grid.ScrollToOffset(a.grid.GetScrollOffset() + scrollAmt) - a.grid.Refresh() } func (a *ArtistsPage) CreateRenderer() fyne.WidgetRenderer { diff --git a/ui/browsing/favoritespage.go b/ui/browsing/favoritespage.go index 1a515fc..4fbc4b4 100644 --- a/ui/browsing/favoritespage.go +++ b/ui/browsing/favoritespage.go @@ -164,7 +164,6 @@ func (a *FavoritesPage) Scroll(amount float32) { } if grid != nil { grid.ScrollToOffset(grid.GetScrollOffset() + amount) - grid.Refresh() } } diff --git a/ui/browsing/genrespage.go b/ui/browsing/genrespage.go index bbecd69..02350b5 100644 --- a/ui/browsing/genrespage.go +++ b/ui/browsing/genrespage.go @@ -97,7 +97,6 @@ var _ Scrollable = (*GenresPage)(nil) func (a *GenresPage) Scroll(amount float32) { a.list.list.ScrollToOffset(a.list.list.GetScrollOffset() + amount) - a.list.list.Refresh() } func (a *GenresPage) Route() controller.Route { diff --git a/ui/browsing/gridviewpage.go b/ui/browsing/gridviewpage.go index 2fcfccc..4884c76 100644 --- a/ui/browsing/gridviewpage.go +++ b/ui/browsing/gridviewpage.go @@ -195,7 +195,6 @@ var _ Scrollable = (*GridViewPage)(nil) func (g *GridViewPage) Scroll(scrollAmt float32) { g.grid.ScrollToOffset(g.grid.GetScrollOffset() + scrollAmt) - g.grid.Refresh() } func (g *GridViewPage) OnSearched(query string) { diff --git a/ui/browsing/playlistspage.go b/ui/browsing/playlistspage.go index ea256ae..72d95f6 100644 --- a/ui/browsing/playlistspage.go +++ b/ui/browsing/playlistspage.go @@ -87,10 +87,8 @@ var _ Scrollable = (*PlaylistsPage)(nil) func (p *PlaylistsPage) Scroll(scrollAmt float32) { if p.viewToggle.ActivatedButtonIndex() == 1 && p.gridView != nil { p.gridView.ScrollToOffset(p.gridView.GetScrollOffset() + scrollAmt) - p.gridView.Refresh() } else if p.viewToggle.ActivatedButtonIndex() == 0 && p.listView != nil { p.listView.list.ScrollToOffset(p.listView.list.GetScrollOffset() + scrollAmt) - p.listView.list.Refresh() } } diff --git a/ui/widgets/gridview.go b/ui/widgets/gridview.go index 1cd3dd4..5101c2a 100644 --- a/ui/widgets/gridview.go +++ b/ui/widgets/gridview.go @@ -187,7 +187,6 @@ func (g *GridView) ResetFromState(state *GridViewState) { g.stateMutex.Unlock() g.grid.Refresh() g.grid.ScrollToOffset(state.scrollPos) - g.grid.Refresh() } func (g *GridView) ResetFixed(items []GridViewItemModel) { diff --git a/ui/widgets/tracklist.go b/ui/widgets/tracklist.go index 46514c9..f975208 100644 --- a/ui/widgets/tracklist.go +++ b/ui/widgets/tracklist.go @@ -194,7 +194,6 @@ func (t *Tracklist) Reset() { func (t *Tracklist) Scroll(amount float32) { t.list.ScrollToOffset(t.list.GetScrollOffset() + amount) - t.list.Refresh() } func (t *Tracklist) buildHeader() {