Merge pull request #1136 from vktr/feature/sort-by-status

Sort by status
picotorrent · Feb 19, 2021 · 2649978 · 2649978
2 parents 7c4cef0 + 01accd4
commit 2649978
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/picotorrent/ui/models/torrentlistmodel.cpp b/src/picotorrent/ui/models/torrentlistmodel.cpp
@@ -156,6 +156,13 @@ int TorrentListModel::Compare(const wxDataViewItem& item1, const wxDataViewItem&
         if (lhs.totalWantedRemaining == rhs.totalWantedRemaining) { return hashSort(ascending, lhs, rhs); }
         break;
     }
+    case Columns::Status:
+    {
+        if (lhs.state < rhs.state) { return ascending ? -1 : 1; }
+        if (lhs.state > rhs.state) { return ascending ? 1 : -1; }
+        if (lhs.state == rhs.state) { return hashSort(ascending, lhs, rhs); }
+        break;
+    }
     case Columns::Progress:
     {
         if (lhs.progress < rhs.progress) { return ascending ? -1 : 1; }

diff --git a/src/picotorrent/ui/torrentlistview.cpp b/src/picotorrent/ui/torrentlistview.cpp
@@ -68,7 +68,7 @@ TorrentListView::TorrentListView(wxWindow* parent, wxWindowID id, Models::Torren
                 TorrentListModel::Columns::Status,
                 FromDIP(120),
                 wxALIGN_NOT,
-                wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE)));
+                defaultFlags)));
 
     m_columns.push_back(
         ColumnMetadata(