From 34b022a2297b869c7be306e3f6bf8e124adaf1a7 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 5 Feb 2020 16:21:41 -0500
Subject: fixed warning when comparing empty strings filter in data tab fixed
 some bad iterators when removing rows fixed empty directories not being
 marked as such when refreshing always sort directories first even when
 reversing the sort order fixed children not being sorted fixed errors about
 file sizes for directories remember state of checkboxes in data tab

---
 src/filetree.cpp | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'src/filetree.cpp')

diff --git a/src/filetree.cpp b/src/filetree.cpp
index bf3a9a7a..ae1fddfe 100644
--- a/src/filetree.cpp
+++ b/src/filetree.cpp
@@ -150,11 +150,16 @@ void FileTree::clear()
   m_model->clear();
 }
 
+void FileTree::ensureFullyLoaded()
+{
+  m_model->ensureFullyLoaded();
+}
+
 FileTreeItem* FileTree::singleSelection()
 {
   const auto sel = m_tree->selectionModel()->selectedRows();
   if (sel.size() == 1) {
-    return m_model->itemFromIndex(sel[0]);
+    return m_model->itemFromIndex(proxiedIndex(sel[0]));
   }
 
   return nullptr;
@@ -357,7 +362,7 @@ void FileTree::dumpToFile() const
 
   QString file = QFileDialog::getSaveFileName(m_tree->window());
   if (file.isEmpty()) {
-    log::debug("user cancelled");
+    log::debug("user canceled");
     return;
   }
 
@@ -432,7 +437,7 @@ void FileTree::dumpToFile(
 
 void FileTree::onExpandedChanged(const QModelIndex& index, bool expanded)
 {
-  if (auto* item=m_model->itemFromIndex(index)) {
+  if (auto* item=m_model->itemFromIndex(proxiedIndex(index))) {
     item->setExpanded(expanded);
   }
 }
@@ -494,7 +499,7 @@ bool FileTree::showShellMenu(QPoint pos)
   bool warnOnEmpty = true;
 
   for (auto&& index : m_tree->selectionModel()->selectedRows()) {
-    auto* item = m_model->itemFromIndex(index);
+    auto* item = m_model->itemFromIndex(proxiedIndex(index));
     if (!item) {
       continue;
     }
@@ -759,3 +764,14 @@ void FileTree::addCommonMenus(QMenu& menu)
     .callback([&]{ m_tree->collapseAll(); })
     .addTo(menu);
 }
+
+QModelIndex FileTree::proxiedIndex(const QModelIndex& index)
+{
+  auto* model = m_tree->model();
+
+  if (auto* proxy=dynamic_cast<QSortFilterProxyModel*>(model)) {
+    return proxy->mapToSource(index);
+  } else {
+    return index;
+  }
+}
-- 
cgit v1.3.1