d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-23 04:54:18 +00:00
Code Issues Projects Releases Wiki Activity

Keep sub-sorting order (#15074)

Browse Source 
Fixes #15073
This commit is contained in:
Dmitry Khlestkov 2021-06-14 06:57:50 +03:00 committed by GitHub
parent ccb59fbad3
commit 2bd5aca3a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/transferlistsortmodel.cpp
View File

@ -96,10 +96,24 @@ namespace
TransferListSortModel::TransferListSortModel(QObject *parent) TransferListSortModel::TransferListSortModel(QObject *parent)
: QSortFilterProxyModel {parent} : QSortFilterProxyModel {parent}
, m_subSortColumn {"TransferList/SubSortColumn", TransferListModel::TR_NAME, adjustSubSortColumn} , m_subSortColumn {"TransferList/SubSortColumn", TransferListModel::TR_NAME, adjustSubSortColumn}
, m_subSortOrder {"TransferList/SubSortOrder", 0}
{ {
setSortRole(TransferListModel::UnderlyingDataRole); setSortRole(TransferListModel::UnderlyingDataRole);
} }
void TransferListSortModel::sort(const int column, const Qt::SortOrder order)
{
if ((m_lastSortColumn != column) && (m_lastSortColumn != -1))
{
m_subSortColumn = m_lastSortColumn;
m_subSortOrder = m_lastSortOrder;
}
m_lastSortColumn = column;
m_lastSortOrder = ((order == Qt::AscendingOrder) ? 0 : 1);
QSortFilterProxyModel::sort(column, order);
}
void TransferListSortModel::setStatusFilter(TorrentFilter::Type filter) void TransferListSortModel::setStatusFilter(TorrentFilter::Type filter)
{ {
if (m_filter.setType(filter)) if (m_filter.setType(filter))
@ -219,16 +233,16 @@ bool TransferListSortModel::lessThan(const QModelIndex &left, const QModelIndex
{ {
Q_ASSERT(left.column() == right.column()); Q_ASSERT(left.column() == right.column());
if (m_lastSortColumn != left.column())
{
if (m_lastSortColumn != -1)
m_subSortColumn = m_lastSortColumn;
m_lastSortColumn = left.column();
}
const int result = compare(left, right); const int result = compare(left, right);
if (result == 0) if (result == 0)
return compare(left.sibling(left.row(), m_subSortColumn), right.sibling(right.row(), m_subSortColumn)) < 0; {
const int subResult = compare(left.sibling(left.row(), m_subSortColumn), right.sibling(right.row(), m_subSortColumn));
// Qt inverses lessThan() result when ordered descending.
// For sub-sorting we have to do it manually.
// When both are ordered descending subResult must be double-inversed, which is the same as no inversion.
const bool inverseSubResult = (m_lastSortOrder != m_subSortOrder); // exactly one is descending
return (inverseSubResult ? (subResult > 0) : (subResult < 0));
}
return result < 0; return result < 0;
} }

8
src/gui/transferlistsortmodel.h
View File

@ -47,6 +47,8 @@ class TransferListSortModel final : public QSortFilterProxyModel
public: public:
explicit TransferListSortModel(QObject *parent = nullptr); explicit TransferListSortModel(QObject *parent = nullptr);
void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
void setStatusFilter(TorrentFilter::Type filter); void setStatusFilter(TorrentFilter::Type filter);
void setCategoryFilter(const QString &category); void setCategoryFilter(const QString &category);
void disableCategoryFilter(); void disableCategoryFilter();
@ -63,8 +65,10 @@ private:
bool matchFilter(int sourceRow, const QModelIndex &sourceParent) const; bool matchFilter(int sourceRow, const QModelIndex &sourceParent) const;
TorrentFilter m_filter; TorrentFilter m_filter;
mutable CachedSettingValue<int> m_subSortColumn; CachedSettingValue<int> m_subSortColumn;
mutable int m_lastSortColumn = -1; CachedSettingValue<int> m_subSortOrder;
int m_lastSortColumn = -1;
int m_lastSortOrder = 0;
Utils::Compare::NaturalCompare<Qt::CaseInsensitive> m_naturalCompare; Utils::Compare::NaturalCompare<Qt::CaseInsensitive> m_naturalCompare;
}; };