mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 20:00:13 +02:00
Code Issues Releases Wiki Activity

* Fixed sorting behaviour for edge cases.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2010-11-24 08:30:52 +01:00
parent 309f2560b5
commit 61f70dd3a7
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/playlist/collectionproxymodel.cpp
View File

@@ -67,11 +67,6 @@ CollectionProxyModel::lessThan( const QModelIndex& left, const QModelIndex& righ
id2 = r->dbid(); id2 = r->dbid();
} }
if ( album1 == "Gern Geschehen" )
{
qDebug() << artist1 << artist2 << album1 << album2 << id1 << id2;
}
if ( left.column() == 0 ) // sort by artist if ( left.column() == 0 ) // sort by artist
{ {
if ( artist1 == artist2 ) if ( artist1 == artist2 )
@@ -79,9 +74,7 @@ CollectionProxyModel::lessThan( const QModelIndex& left, const QModelIndex& righ
if ( album1 == album2 ) if ( album1 == album2 )
{ {
if ( albumpos1 == albumpos2 ) if ( albumpos1 == albumpos2 )
{
return id1 < id2; return id1 < id2;
}
return albumpos1 < albumpos2; return albumpos1 < albumpos2;
} }
@@ -95,6 +88,9 @@ CollectionProxyModel::lessThan( const QModelIndex& left, const QModelIndex& righ
{ {
if ( album1 == album2 ) if ( album1 == album2 )
{ {
if ( albumpos1 == albumpos2 )
return id1 < id2;
return albumpos1 < albumpos2; return albumpos1 < albumpos2;
} }
@@ -102,10 +98,16 @@ CollectionProxyModel::lessThan( const QModelIndex& left, const QModelIndex& righ
} }
else if ( left.column() == 4 ) // sort by bitrate else if ( left.column() == 4 ) // sort by bitrate
{ {
if ( bitrate1 == bitrate2 )
return id1 < id2;
return bitrate1 < bitrate2; return bitrate1 < bitrate2;
} }
else if ( left.column() == 5 ) // sort by mtime else if ( left.column() == 5 ) // sort by mtime
{ {
if ( mtime1 == mtime2 )
return id1 < id2;
return mtime1 < mtime2; return mtime1 < mtime2;
} }