Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Change sort text for divider keys 

Fixes problems on Windows with specific regionale settings, where
divider keys are all on the top, while albums are on the bottom
This commit is contained in:
Jonas Kvinge 2020-09-12 13:30:45 +02:00
parent 75dc0aafcf
commit d668a8aee2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/collection/collectionmodel.cpp
View File

@ -397,7 +397,7 @@ QString CollectionModel::DividerKey(const GroupBy type, CollectionItem *item) co
case GroupBy_Genre:
case GroupBy_Format:
case GroupBy_FileType: {
QChar c = item->sort_text[0];
QChar c = item->sort_text[0].toUpper();
if (c.isDigit()) return "0";
if (c == ' ') return QString();
if (c.decompositionTag() != QChar::NoDecomposition)
@ -1564,7 +1564,8 @@ void CollectionModel::FinishItem(const GroupBy type, const bool signal, const bo
// Create the divider entry if we're supposed to
if (create_divider && show_dividers_) {
QString divider_key = DividerKey(type, item);
item->sort_text.prepend(divider_key);
if (item->sort_text.isEmpty() || item->sort_text[0].toUpper() != divider_key)
item->sort_text.prepend(divider_key);
if (!divider_key.isEmpty() && !divider_nodes_.contains(divider_key)) {
if (signal)
@ -1573,7 +1574,7 @@ void CollectionModel::FinishItem(const GroupBy type, const bool signal, const bo
CollectionItem *divider = new CollectionItem(CollectionItem::Type_Divider, root_);
divider->key = divider_key;
divider->display_text = DividerDisplayText(type, divider_key);
divider->sort_text = divider_key;
divider->sort_text = divider_key + "0000";
divider->lazy_loaded = true;
divider_nodes_[divider_key] = divider;