just disable recursive filtering when fully loading

switching models clears persistent indexes and collapses everything

5 files changed, 25 insertions, 23 deletions

diff --git a/src/datatab.cpp b/src/datatab.cpp
index d8ce9c3a..f263c2c6 100644
--- a/src/datatab.cpp
+++ b/src/datatab.cpp
@@ -37,7 +37,7 @@ DataTab::DataTab(
 
   connect(
     &m_filter, &FilterWidget::aboutToChange,
-    [&]{ m_filetree->ensureFullyLoaded(); });
+    [&]{ ensureFullyLoaded(); });
 
   connect(
     ui.refresh, &QPushButton::clicked,
@@ -107,7 +107,7 @@ void DataTab::updateTree()
   m_filetree->refresh();
 
   if (!m_filter.empty()) {
-    m_filetree->ensureFullyLoaded();
+    ensureFullyLoaded();
 
     if (auto* m=m_filter.proxyModel()) {
       m->invalidate();
@@ -115,6 +115,15 @@ void DataTab::updateTree()
   }
 }
 
+void DataTab::ensureFullyLoaded()
+{
+  if (!m_filetree->fullyLoaded()) {
+    m_filter.proxyModel()->setRecursiveFilteringEnabled(false);
+    m_filetree->ensureFullyLoaded();
+    m_filter.proxyModel()->setRecursiveFilteringEnabled(true);
+  }
+}
+
 void DataTab::onConflicts()
 {
   updateOptions();
diff --git a/src/datatab.h b/src/datatab.h
index 1e006898..a0f29a5f 100644
--- a/src/datatab.h
+++ b/src/datatab.h
@@ -56,4 +56,5 @@ private:
   void onConflicts();
   void onArchives();
   void updateOptions();
+  void ensureFullyLoaded();
 };
diff --git a/src/filetree.cpp b/src/filetree.cpp
index 937ffe4c..19f2555a 100644
--- a/src/filetree.cpp
+++ b/src/filetree.cpp
@@ -157,30 +157,14 @@ void FileTree::clear()
   m_model->clear();
 }
 
-void FileTree::ensureFullyLoaded()
+bool FileTree::fullyLoaded() const
 {
-  QAbstractProxyModel* proxy = nullptr;
-
-  if (m_tree->model() != m_model) {
-    // looks like there's a proxy on the tree, disable it
-    proxy = dynamic_cast<QAbstractProxyModel*>(m_tree->model());
-
-    m_tree->setModel(m_model);
-
-    if (proxy) {
-      if (proxy->sourceModel() != m_model)
-        DebugBreak();
-
-      proxy->setSourceModel(nullptr);
-    }
-  }
+  return m_model->fullyLoaded();
+}
 
+void FileTree::ensureFullyLoaded()
+{
   m_model->ensureFullyLoaded();
-
-  if (proxy) {
-    proxy->setSourceModel(m_model);
-    m_tree->setModel(proxy);
-  }
 }
 
 FileTreeItem* FileTree::singleSelection()
diff --git a/src/filetree.h b/src/filetree.h
index 3c3ffc07..c1458179 100644
--- a/src/filetree.h
+++ b/src/filetree.h
@@ -21,6 +21,8 @@ public:
   FileTreeModel* model();
   void refresh();
   void clear();
+
+  bool fullyLoaded() const;
   void ensureFullyLoaded();
 
   void open(FileTreeItem* item=nullptr);
diff --git a/src/filetreemodel.h b/src/filetreemodel.h
index dfee597f..fbc7ec44 100644
--- a/src/filetreemodel.h
+++ b/src/filetreemodel.h
@@ -50,6 +50,12 @@ public:
 
   void refresh();
   void clear();
+
+  bool fullyLoaded() const
+  {
+    return m_fullyLoaded;
+  }
+
   void ensureFullyLoaded();
 
   bool enabled() const;