change sort selector to button on Albums page

ui/browsing/artistpage.go

@@ -51,7 +51,7 @@ type ArtistPage struct {
 
 	albumGrid    *widgets.GridView
 	tracklistCtr *fyne.Container
-	sortButton   *widgets.IconButton
+	sortButton   *widgets.SortChooserButton
 	nowPlayingID string
 	header       *ArtistPageHeader
 	container    *fyne.Container
@@ -96,8 +96,16 @@ func newArtistPage(artistID string, cfg *backend.ArtistPageConfig, pool *util.Wi
 	viewToggle := widgets.NewToggleText(0, []string{lang.L("Discography"), lang.L("Top Tracks")})
 	viewToggle.SetActivatedLabel(a.activeView)
 	viewToggle.OnChanged = a.onViewChange
-	a.sortButton = widgets.NewIconButton(myTheme.SortIcon, a.showAlbumSortMenu)
-	a.sortButton.SetToolTip(lang.L("Sort"))
+	a.sortButton = widgets.NewSortChooserButton(util.LocalizeSlice(discographySorts), func(selIdx int) {
+		a.cfg.DiscographySort = discographySorts[selIdx]
+		a.showAlbumGrid(true /*reSort*/)
+	})
+	a.sortButton.AlignLeft = true
+	for i, sort := range discographySorts {
+		if sort == a.cfg.DiscographySort {
+			a.sortButton.SetSelectedIndex(i)
+		}
+	}
 	viewToggleRow := container.NewBorder(nil, nil,
 		container.NewHBox(util.NewHSpace(5), viewToggle),
 		container.NewHBox(a.sortButton, util.NewHSpace(10)),
@@ -182,31 +190,6 @@ func (a *ArtistPage) playArtistRadio() {
 	}()
 }
 
-func (a *ArtistPage) showAlbumSortMenu() {
-	m := fyne.NewMenu("")
-	oneChecked := false
-	for i, s := range util.LocalizeSlice(discographySorts) {
-		_i := i
-		item := fyne.NewMenuItem(s, func() {
-			a.cfg.DiscographySort = discographySorts[_i]
-			a.showAlbumGrid(true /*reSort*/)
-		})
-		if discographySorts[i] == a.cfg.DiscographySort {
-			item.Checked = true
-			oneChecked = true
-		}
-		m.Items = append(m.Items, item)
-	}
-	if !oneChecked {
-		m.Items[0].Checked = true
-	}
-	btnPos := fyne.CurrentApp().Driver().AbsolutePositionForObject(a.sortButton)
-	btnSize := a.sortButton.Size()
-	pop := widget.NewPopUpMenu(m, fyne.CurrentApp().Driver().CanvasForObject(a))
-	menuW := pop.MinSize().Width
-	pop.ShowAtPosition(fyne.NewPos(btnPos.X+btnSize.Width-menuW, btnPos.Y+btnSize.Height))
-}
-
 func (a *ArtistPage) getGridViewAlbumsModel() []widgets.GridViewItemModel {
 	if a.artistInfo == nil {
 		return nil

ui/browsing/gridviewpage.go

@@ -29,7 +29,7 @@ type GridViewPage[M, F any] struct {
 	searchGridState *widgets.GridViewState
 
 	title      *widget.RichText
-	sortOrder  *widget.Select
+	sortOrder  *widgets.SortChooserButton
 	filterBtn  widgets.FilterButton[M, F]
 	filter     mediaprovider.MediaFilter[M, F]
 	searcher   *widgets.SearchEntry
@@ -125,15 +125,7 @@ func (g *GridViewPage[M, F]) createTitleAndSort() {
 	})
 	if s, ok := g.adapter.(SortableGridViewPageAdapter); ok {
 		sorts, selected := s.SortOrders()
-		g.sortOrder = widget.NewSelect(sorts, g.onSortOrderChanged)
-		// find longest string
-		l := ""
-		for _, s := range sorts {
-			if len(s) > len(l) {
-				l = s
-			}
-		}
-		g.sortOrder.PlaceHolder = l // props up MinSize.Width
+		g.sortOrder = widgets.NewSortChooserButton(sorts, g.onSortOrderChanged)
 		g.sortOrder.SetSelectedIndex(selected)
 	}
 }
@@ -213,13 +205,13 @@ func (g *GridViewPage[M, F]) doSearch(query string) {
 	g.grid.Reset(g.adapter.SearchIter(query, g.getFilter()))
 }
 
-func (g *GridViewPage[M, F]) onSortOrderChanged(_ string) {
+func (g *GridViewPage[M, F]) onSortOrderChanged(idx int) {
 	if g.grid == nil {
 		return // callback from initializing
 	}
 
 	g.adapter.(SortableGridViewPageAdapter).SaveSortOrder(g.getSortOrderIdx())
-	g.grid.Reset(g.adapter.Iter(g.getSortOrderIdx(), g.getFilter()))
+	g.grid.Reset(g.adapter.Iter(idx, g.getFilter()))
 }
 
 func (g *GridViewPage[M, F]) getFilter() mediaprovider.MediaFilter[M, F] {