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

fix sorting columns in expanded rows tracklist

Browse Source
This commit is contained in:
Drew Weymouth
2024-05-30 08:58:59 -07:00
parent 4e531e5b4b
commit 6ad98af466
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/widgets/tracklist.go
+6 -3
View File
@@ -287,7 +287,7 @@ func (t *Tracklist) VisibleColumns() []string {
var cols []string var cols []string
for i := 2; i < len(t.visibleColumns); i++ { for i := 2; i < len(t.visibleColumns); i++ {
if t.visibleColumns[i] { if t.visibleColumns[i] {
cols = append(cols, string(colName(i))) cols = append(cols, string(t.colName(i, false)))
} }
} }
return cols return cols
@@ -511,7 +511,7 @@ func (t *Tracklist) doSortTracks() {
} }
func (t *Tracklist) onSorted(sort ListHeaderSort) { func (t *Tracklist) onSorted(sort ListHeaderSort) {
t.sorting = TracklistSort{ColumnName: colName(sort.ColNumber), SortOrder: sort.Type} t.sorting = TracklistSort{ColumnName: t.colName(sort.ColNumber, true), SortOrder: sort.Type}
t.tracksMutex.Lock() t.tracksMutex.Lock()
t.doSortTracks() t.doSortTracks()
t.tracksMutex.Unlock() t.tracksMutex.Unlock()
@@ -737,7 +737,10 @@ func ColNumber(colName string) int {
return i return i
} }
func colName(i int) string { func (t *Tracklist) colName(i int, adjustForExpandedRows bool) string {
if adjustForExpandedRows && !t.compactRows && i >= 2 {
i += 1 // adjust for off-by-one from combined title/artist column
}
if i < len(columns) { if i < len(columns) {
return columns[i] return columns[i]
} }