owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

save scroll position of Playlists page views in browsing history

Browse Source
This commit is contained in:
Drew Weymouth
2024-04-27 15:36:22 -07:00
parent 02d4082f3d
commit e4514c502c
1 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/browsing/playlistspage.go
+32 -4
View File
@@ -41,6 +41,9 @@ type PlaylistsPage struct {
listView *PlaylistList
listSort widgets.ListHeaderSort
gridView *widgets.GridView
initialListScrollPos float32
initialGridScrollPos float32
}
func NewPlaylistsPage(contr *controller.Controller, pool *util.WidgetPool, cfg *backend.PlaylistsPageConfig, mp mediaprovider.MediaProvider) *PlaylistsPage {
@@ -48,10 +51,20 @@ func NewPlaylistsPage(contr *controller.Controller, pool *util.WidgetPool, cfg *
if cfg.InitialView == "Grid" {
activeView = 1
}
return newPlaylistsPage(contr, pool, cfg, mp, "", activeView, widgets.ListHeaderSort{})
return newPlaylistsPage(contr, pool, cfg, mp, "", activeView, widgets.ListHeaderSort{}, 0, 0)
}
func newPlaylistsPage(contr *controller.Controller, pool *util.WidgetPool, cfg *backend.PlaylistsPageConfig, mp mediaprovider.MediaProvider, searchText string, activeView int, listSort widgets.ListHeaderSort) *PlaylistsPage {
func newPlaylistsPage(
contr *controller.Controller,
pool *util.WidgetPool,
cfg *backend.PlaylistsPageConfig,
mp mediaprovider.MediaProvider,
searchText string,
activeView int,
listSort widgets.ListHeaderSort,
listScrollPos float32,
gridScrollPos float32,
) *PlaylistsPage {
a := &PlaylistsPage{
pool: pool,
cfg: cfg,
@@ -59,6 +72,8 @@ func newPlaylistsPage(contr *controller.Controller, pool *util.WidgetPool, cfg *
contr: contr,
listSort: listSort,
titleDisp: widget.NewRichTextWithText("Playlists"),
initialListScrollPos: listScrollPos,
initialGridScrollPos: gridScrollPos,
}
a.ExtendBaseWidget(a)
a.titleDisp.Segments[0].(*widget.TextSegment).Style.SizeName = theme.SizeNameHeadingText
@@ -224,10 +239,19 @@ func (a *PlaylistsPage) refreshView(playlists []*mediaprovider.Playlist) {
a.gridView.ResetFixed(createPlaylistGridViewModel(playlists))
}
if a.viewToggle.ActivatedButtonIndex() == 0 {
a.listView.Refresh()
a.listView.Refresh() // ensures content size updates for ScrollToOffset too
if a.initialListScrollPos != 0 {
a.listView.list.ScrollToOffset(a.initialListScrollPos)
a.initialListScrollPos = 0
}
} else {
if a.initialGridScrollPos != 0 {
a.gridView.ScrollToOffset(a.initialGridScrollPos)
a.initialGridScrollPos = 0
} else {
a.gridView.Refresh()
}
}
}
var _ Searchable = (*PlaylistsPage)(nil)
@@ -254,10 +278,12 @@ func (a *PlaylistsPage) Save() SavedPage {
activeView: a.viewToggle.ActivatedButtonIndex(),
}
if a.gridView != nil {
s.gridScrollPos = a.gridView.GetScrollOffset()
a.gridView.Clear()
a.pool.Release(util.WidgetTypeGridView, a.gridView)
}
if a.listView != nil {
s.listScrollPos = a.listView.list.GetScrollOffset()
s.listSort = a.listView.sorting
}
return s
@@ -271,10 +297,12 @@ type savedPlaylistsPage struct {
searchText string
activeView int
listSort widgets.ListHeaderSort
listScrollPos float32
gridScrollPos float32
}
func (s *savedPlaylistsPage) Restore() Page {
return newPlaylistsPage(s.contr, s.pool, s.cfg, s.mp, s.searchText, s.activeView, s.listSort)
return newPlaylistsPage(s.contr, s.pool, s.cfg, s.mp, s.searchText, s.activeView, s.listSort, s.listScrollPos, s.gridScrollPos)
}
func (a *PlaylistsPage) buildContainer(initialView fyne.CanvasObject) {