Add collapse recursive feature to project trees (2)

hicknhack-software · Oct 14, 2024 · 041e240 · 041e240
1 parent 3a7c7c7
commit 041e240
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 0 deletions.
diff --git a/src/plugins/coreplugin/foldernavigationwidget.cpp b/src/plugins/coreplugin/foldernavigationwidget.cpp
@@ -699,6 +699,7 @@ void FolderNavigationWidget::contextMenuEvent(QContextMenuEvent *ev)
     }
 
     menu.addSeparator();
+    QAction *const collapseNodeAction = menu.addAction(Tr::tr("Collapse"));
     QAction *const collapseAllAction = menu.addAction(Tr::tr("Collapse All"));
 
     QAction *action = menu.exec(ev->globalPos());
@@ -722,6 +723,14 @@ void FolderNavigationWidget::contextMenuEvent(QContextMenuEvent *ev)
             if (!errorMessage.isEmpty())
                 QMessageBox::critical(ICore::dialogParent(), Tr::tr("Error"), errorMessage);
         }
+    } else if (action == collapseNodeAction) {
+        auto collapseRecursive = [this](auto&& recurse, QModelIndex index) -> void {
+            auto const rc = m_fileSystemModel->rowCount(index);
+            for (auto i = 0; i < rc; ++i)
+                recurse(recurse, index.model()->index(i, index.column(), index));
+            if (rc > 0) m_listView->collapse(index);
+        };
+        collapseRecursive(collapseRecursive, m_listView->currentIndex());
     } else if (action == collapseAllAction) {
         m_listView->collapseAll();
     }

diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1627,6 +1627,11 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     Command * const expandNodeCmd = ActionManager::registerAction(
                 dd->m_projectTreeExpandNodeAction, "ProjectExplorer.ExpandNode",
                 projectTreeContext);
+    auto* projectTreeCollapseNodeAction = new QAction(Tr::tr("Collapse"), this);
+    QObject::connect(projectTreeCollapseNodeAction, &QAction::triggered, ProjectTree::instance(),
+            &ProjectTree::collapseCurrentNodeRecursively);
+    auto* const collapseNodeCmd = ActionManager::registerAction(projectTreeCollapseNodeAction,
+            "ProjectExplorer.CollapseNode", projectTreeContext);
     dd->m_projectTreeCollapseAllAction = new QAction(Tr::tr("Collapse All"), this);
     Command * const collapseCmd = ActionManager::registerAction(
                 dd->m_projectTreeCollapseAllAction, Constants::PROJECTTREE_COLLAPSE_ALL,
@@ -1639,6 +1644,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
          mfolderContextMenu, mprojectContextMenu, msessionContextMenu}) {
         ac->addSeparator(treeGroup);
         ac->addAction(expandNodeCmd, treeGroup);
+        ac->addAction(collapseNodeCmd, treeGroup);
         ac->addAction(collapseCmd, treeGroup);
         ac->addAction(expandCmd, treeGroup);
     }

diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp
@@ -269,6 +269,12 @@ void ProjectTree::expandCurrentNodeRecursively()
         w->expandCurrentNodeRecursively();
 }
 
+void ProjectTree::collapseCurrentNodeRecursively()
+{
+    if (const auto w = currentWidget())
+        w->collapseCurrentNodeRecursively();
+}
+
 void ProjectTree::collapseAll()
 {
     if (const auto w = currentWidget())

diff --git a/src/plugins/projectexplorer/projecttree.h b/src/plugins/projectexplorer/projecttree.h
@@ -77,6 +77,7 @@ class PROJECTEXPLORER_EXPORT ProjectTree : public QObject
     static const QList<Node *> siblingsWithSameBaseName(const Node *fileNode);
 
     void expandCurrentNodeRecursively();
+    void collapseCurrentNodeRecursively();
 
     void collapseAll();
     void expandAll();

diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -423,11 +423,25 @@ void ProjectTreeWidget::expandNodeRecursively(const QModelIndex &index)
         m_view->expand(index);
 }
 
+void ProjectTreeWidget::collapseNodeRecursively(const QModelIndex &index)
+{
+    const int rc = index.model()->rowCount(index);
+    for (int i = 0; i < rc; ++i)
+        collapseNodeRecursively(index.model()->index(i, index.column(), index));
+    if (rc > 0)
+        m_view->collapse(index);
+}
+
 void ProjectTreeWidget::expandCurrentNodeRecursively()
 {
     expandNodeRecursively(m_view->currentIndex());
 }
 
+void ProjectTreeWidget::collapseCurrentNodeRecursively()
+{
+    collapseNodeRecursively(m_view->currentIndex());
+}
+
 void ProjectTreeWidget::collapseAll()
 {
     m_view->collapseAll();

diff --git a/src/plugins/projectexplorer/projecttreewidget.h b/src/plugins/projectexplorer/projecttreewidget.h
@@ -44,6 +44,7 @@ class ProjectTreeWidget final : public QWidget
     void toggleAutoSynchronization();
     void editCurrentItem();
     void expandCurrentNodeRecursively();
+    void collapseCurrentNodeRecursively();
     void collapseAll();
     void expandAll();
 
@@ -68,6 +69,7 @@ class ProjectTreeWidget final : public QWidget
     void syncFromDocumentManager();
 
     void expandNodeRecursively(const QModelIndex &index);
+    void collapseNodeRecursively(const QModelIndex &index);
 
     QTreeView *m_view = nullptr;
     FlatModel *m_model = nullptr;