reapack

commit 341a26e3e1d9659e9c9b60e773820c59b9adc2a1
parent f4fbde357e8a59686d69d5965062886c332877db
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Mon, 20 Jun 2016 23:05:19 -0400

listview: better separation of default vs user sort settings

Diffstat:
M
src/listview.cpp
 | 
8
++++----
M
src/listview.hpp
 | 
2
+-

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/listview.cpp b/src/listview.cpp
@@ -158,14 +158,14 @@ void ListView::sort()
   ListView_SortItems(handle(), compare, (LPARAM)this);
 }
 
-void ListView::sortByColumn(const int index, const SortOrder order)
+void ListView::sortByColumn(const int index, const SortOrder order, const bool user)
 {
   if(m_sort)
     setSortArrow(false);
 
   const auto settings = Sort(index, order);
 
-  if(!m_sort)
+  if(!user)
     m_defaultSort = settings;
 
   m_sort = settings;
@@ -342,7 +342,7 @@ void ListView::handleColumnClick(LPARAM lParam)
     }
   }
 
-  sortByColumn(col, order);
+  sortByColumn(col, order, true);
   sort();
 }
 
@@ -440,7 +440,7 @@ bool ListView::restore(const string &data, const int userVersion)
       break;
     case -1: // sort
       if(left < columnCount())
-        sortByColumn(left, right == 0 ? AscendingOrder : DescendingOrder);
+        sortByColumn(left, right == 0 ? AscendingOrder : DescendingOrder, true);
       break;
     default:
       order[col] = left;
diff --git a/src/listview.hpp b/src/listview.hpp
@@ -48,7 +48,7 @@ public:
   void resizeColumn(int index, int width);
   int columnSize(int index) const;
   void sort();
-  void sortByColumn(int index, SortOrder order = AscendingOrder);
+  void sortByColumn(int index, SortOrder order = AscendingOrder, bool user = false);
   void clear();
   void setSelected(int index, bool select);
   void select(int index) { setSelected(index, true); }