Merge pull request #475 from maciejsszmigiero/directories-first-order-fix

Restore directories-first order of passwords tree view on non-Mac platforms

3 files changed, 23 insertions, 5 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c794a521..a3b1c9c5 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -65,16 +65,15 @@ MainWindow::MainWindow(const QString &searchText, QWidget *parent)
 
   QString passStore = QtPassSettings::getPassStore(Util::findPasswordStore());
 
-  proxyModel.setSourceModel(&model);
+  QModelIndex rootDir = model.setRootPath(passStore);
+  model.fetchMore(rootDir);
+
   proxyModel.setModelAndStore(&model, passStore);
-  // proxyModel.sort(0, Qt::AscendingOrder);
   selectionModel.reset(new QItemSelectionModel(&proxyModel));
-  model.fetchMore(model.setRootPath(passStore));
-  // model.sort(0, Qt::AscendingOrder);
 
   ui->treeView->setModel(&proxyModel);
   ui->treeView->setRootIndex(
-      proxyModel.mapFromSource(model.setRootPath(passStore)));
+      proxyModel.mapFromSource(rootDir));
   ui->treeView->setColumnHidden(1, true);
   ui->treeView->setColumnHidden(2, true);
   ui->treeView->setColumnHidden(3, true);
diff --git a/src/storemodel.cpp b/src/storemodel.cpp
index a46e1b03..06c3c036 100644
--- a/src/storemodel.cpp
+++ b/src/storemodel.cpp
@@ -80,6 +80,7 @@ bool StoreModel::ShowThis(const QModelIndex index) const {
  */
 void StoreModel::setModelAndStore(QFileSystemModel *sourceModel,
                                   QString passStore) {
+  setSourceModel(sourceModel);
   fs = sourceModel;
   store = std::move(passStore);
 }
@@ -255,3 +256,19 @@ bool StoreModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
   }
   return true;
 }
+
+bool StoreModel::lessThan(const QModelIndex &source_left,
+                          const QModelIndex &source_right) const {
+/* matches logic in QFileSystemModelSorter::compareNodes() */
+#ifndef Q_OS_MAC
+  if (fs && (source_left.column() == 0 || source_left.column() == 1)) {
+    bool leftD = fs->isDir(source_left);
+    bool rightD = fs->isDir(source_right);
+
+    if (leftD ^ rightD)
+      return leftD;
+  }
+#endif
+
+  return QSortFilterProxyModel::lessThan(source_left, source_right);
+}
diff --git a/src/storemodel.h b/src/storemodel.h
index 66486b10..6c8053e9 100644
--- a/src/storemodel.h
+++ b/src/storemodel.h
@@ -23,6 +23,8 @@ public:
   bool ShowThis(const QModelIndex) const;
   void setModelAndStore(QFileSystemModel *sourceModel, QString passStore);
   QVariant data(const QModelIndex &index, int role) const;
+  bool lessThan(const QModelIndex &source_left,
+                const QModelIndex &source_right) const override;
 
   // QAbstractItemModel interface
 public: