diff --git a/ui/browsing/playlistspage.go b/ui/browsing/playlistspage.go index e211c97..a31a185 100644 --- a/ui/browsing/playlistspage.go +++ b/ui/browsing/playlistspage.go @@ -286,10 +286,10 @@ func NewPlaylistList() *PlaylistList { func (p *PlaylistList) buildHeader() { p.header = widgets.NewListHeader([]widgets.ListColumn{ - {"Name", false, false}, - {"Description", false, false}, - {"Owner", false, false}, - {"Track Count", true, false}}, p.columnsLayout) + {"Name", fyne.TextAlignLeading, false}, + {"Description", fyne.TextAlignLeading, false}, + {"Owner", fyne.TextAlignLeading, false}, + {"Track Count", fyne.TextAlignTrailing, false}}, p.columnsLayout) p.header.DisableSorting = true } diff --git a/ui/widgets/artistgenrelist.go b/ui/widgets/artistgenrelist.go index a032ab9..e673bd6 100644 --- a/ui/widgets/artistgenrelist.go +++ b/ui/widgets/artistgenrelist.go @@ -65,7 +65,7 @@ func NewArtistGenreList(items []ArtistGenreListItemModel) *ArtistGenreList { } a.ExtendBaseWidget(a) a.hdr = NewListHeader([]ListColumn{ - {"Name", false, false}, {"Album Count", true, false}, {"Track Count", true, false}}, a.columnsLayout) + {"Name", fyne.TextAlignLeading, false}, {"Album Count", fyne.TextAlignTrailing, false}, {"Track Count", fyne.TextAlignTrailing, false}}, a.columnsLayout) a.hdr.DisableSorting = true a.list = widget.NewList( func() int { return len(a.Items) }, diff --git a/ui/widgets/listheader.go b/ui/widgets/listheader.go index 30fd5f0..7f3d418 100644 --- a/ui/widgets/listheader.go +++ b/ui/widgets/listheader.go @@ -8,7 +8,6 @@ import ( "github.com/dweymouth/supersonic/ui/util" "fyne.io/fyne/v2" - "fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/theme" @@ -30,7 +29,7 @@ type ListHeaderSort struct { type ListColumn struct { Text string - AlignTrailing bool + Alignment fyne.TextAlign CanToggleVisible bool } @@ -90,14 +89,7 @@ func (l *ListHeader) buildColumns() { return func(sort SortType) { l.SetSorting(ListHeaderSort{ColNumber: i, Type: sort}) } }(i) hdr.OnTappedSecondary = l.TappedSecondary - l.columnsContainer.Add( - // hdr, - // TODO: remove debugging background - container.NewMax(container.New(&layouts.MaxPadLayout{PadLeft: 2, PadRight: 2}, - canvas.NewRectangle(theme.SelectionColor())), - hdr, - ), - ) + l.columnsContainer.Add(hdr) } } @@ -109,13 +101,10 @@ func (l *ListHeader) SetSorting(sort ListHeaderSort) { } l.sort = sort for i, c := range l.columnsContainer.Objects { - // TODO - //c.(*colHeader).Sort = sortNone - hdr := c.(*fyne.Container).Objects[1].(*colHeader) if i == sort.ColNumber { - hdr.Sort = sort.Type + c.(*colHeader).Sort = sort.Type } else { - hdr.Sort = SortNone + c.(*colHeader).Sort = SortNone } } l.Refresh() @@ -189,12 +178,10 @@ func newColHeader(columnCfg ListColumn, sortDisabled *bool) *colHeader { c.ExtendBaseWidget(c) c.label = widget.NewRichTextWithText(columnCfg.Text) - c.label.Segments[0].(*widget.TextSegment).Style.TextStyle.Bold = true - al := fyne.TextAlignLeading - if columnCfg.AlignTrailing { - al = fyne.TextAlignTrailing + c.label.Segments[0].(*widget.TextSegment).Style = widget.RichTextStyle{ + TextStyle: fyne.TextStyle{Bold: true}, + Alignment: columnCfg.Alignment, } - c.label.Segments[0].(*widget.TextSegment).Style.Alignment = al c.sortIcon = widget.NewIcon(theme.MenuDropDownIcon()) // hack to remove extra icon space // should be hidden whenever sortIcon is hidden @@ -250,12 +237,15 @@ func (c *colHeader) Refresh() { func (c *colHeader) CreateRenderer() fyne.WidgetRenderer { if c.container == nil { c.container = container.New(&layouts.HboxCustomPadding{DisableThemePad: true, ExtraPad: -8}) - if c.columnCfg.AlignTrailing { + if c.columnCfg.Alignment != fyne.TextAlignLeading { c.container.Add(layout.NewSpacer()) } c.container.Add(c.label) c.container.Add(c.sortIcon) c.container.Add(c.sortIconNegSpacer) + if c.columnCfg.Alignment == fyne.TextAlignCenter { + c.container.Add(layout.NewSpacer()) + } } return widget.NewSimpleRenderer(c.container) } diff --git a/ui/widgets/tracklist.go b/ui/widgets/tracklist.go index 606cb27..cda38a8 100644 --- a/ui/widgets/tracklist.go +++ b/ui/widgets/tracklist.go @@ -144,18 +144,18 @@ func NewTracklist(tracks []*mediaprovider.Track) *Tracklist { func (t *Tracklist) buildHeader() { t.hdr = NewListHeader([]ListColumn{ - {Text: "#", AlignTrailing: true, CanToggleVisible: false}, - {Text: "Title", AlignTrailing: false, CanToggleVisible: false}, - {Text: "Artist", AlignTrailing: false, CanToggleVisible: true}, - {Text: "Album", AlignTrailing: false, CanToggleVisible: true}, - {Text: "Time", AlignTrailing: true, CanToggleVisible: true}, - {Text: "Year", AlignTrailing: true, CanToggleVisible: true}, - {Text: "Fav.", AlignTrailing: false, CanToggleVisible: true}, - {Text: "Rating", AlignTrailing: false, CanToggleVisible: true}, - {Text: "Plays", AlignTrailing: true, CanToggleVisible: true}, - {Text: "Bitrate", AlignTrailing: true, CanToggleVisible: true}, - {Text: "Size", AlignTrailing: true, CanToggleVisible: true}, - {Text: "File Path", AlignTrailing: false, CanToggleVisible: true}}, + {Text: "#", Alignment: fyne.TextAlignTrailing, CanToggleVisible: false}, + {Text: "Title", Alignment: fyne.TextAlignLeading, CanToggleVisible: false}, + {Text: "Artist", Alignment: fyne.TextAlignLeading, CanToggleVisible: true}, + {Text: "Album", Alignment: fyne.TextAlignLeading, CanToggleVisible: true}, + {Text: "Time", Alignment: fyne.TextAlignTrailing, CanToggleVisible: true}, + {Text: "Year", Alignment: fyne.TextAlignTrailing, CanToggleVisible: true}, + {Text: " Fav.", Alignment: fyne.TextAlignCenter, CanToggleVisible: true}, + {Text: "Rating", Alignment: fyne.TextAlignLeading, CanToggleVisible: true}, + {Text: "Plays", Alignment: fyne.TextAlignTrailing, CanToggleVisible: true}, + {Text: "Bitrate", Alignment: fyne.TextAlignTrailing, CanToggleVisible: true}, + {Text: "Size", Alignment: fyne.TextAlignTrailing, CanToggleVisible: true}, + {Text: "File Path", Alignment: fyne.TextAlignLeading, CanToggleVisible: true}}, t.colLayout) }