feat(ui): load search results on selection

Based on PR #749 by Stephen Holdaway (@stecman). Closes #749.
zealdocs · Dec 29, 2019 · 3118649 · 3118649
1 parent 86f5350
commit 3118649
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 15 deletions.
diff --git a/src/libs/ui/searchsidebar.cpp b/src/libs/ui/searchsidebar.cpp
@@ -123,9 +123,7 @@ SearchSidebar::SearchSidebar(const SearchSidebar *other, QWidget *parent)
     if (other) {
         if (other->m_searchEdit->text().isEmpty()) {
             m_searchModel = new Registry::SearchModel(this);
-
-            m_treeView->setRootIsDecorated(true);
-            m_treeView->setModel(Core::Application::instance()->docsetRegistry()->model());
+            setTreeViewModel(Core::Application::instance()->docsetRegistry()->model(), true);
 
             for (const QModelIndex &index : other->m_expandedIndexList) {
                 m_treeView->expand(index);
@@ -134,8 +132,7 @@ SearchSidebar::SearchSidebar(const SearchSidebar *other, QWidget *parent)
             m_searchEdit->setText(other->m_searchEdit->text());
 
             m_searchModel = other->m_searchModel->clone(this);
-            m_treeView->setRootIsDecorated(false);
-            m_treeView->setModel(m_searchModel);
+            setTreeViewModel(m_searchModel, false);
         }
 
         for (const QModelIndex &index : other->m_treeView->selectionModel()->selectedIndexes()) {
@@ -146,26 +143,35 @@ SearchSidebar::SearchSidebar(const SearchSidebar *other, QWidget *parent)
         m_pendingVerticalPosition = other->m_treeView->verticalScrollBar()->value();
     } else {
         m_searchModel = new Registry::SearchModel(this);
-
-        m_treeView->setRootIsDecorated(true);
-        m_treeView->setModel(Core::Application::instance()->docsetRegistry()->model());
+        setTreeViewModel(Core::Application::instance()->docsetRegistry()->model(), true);
     }
 
     connect(m_searchEdit, &QLineEdit::textChanged, this, [this](const QString &text) {
         QItemSelectionModel *oldSelectionModel = m_treeView->selectionModel();
 
         if (text.isEmpty()) {
-            m_treeView->setModel(Core::Application::instance()->docsetRegistry()->model());
-            m_treeView->setRootIsDecorated(true);
+            setTreeViewModel(Core::Application::instance()->docsetRegistry()->model(), true);
         } else {
-            m_treeView->setModel(m_searchModel);
-            m_treeView->setRootIsDecorated(false);
+            setTreeViewModel(m_searchModel, false);
         }
 
-        // TODO: Remove once QTBUG-49966 is addressed.
         QItemSelectionModel *newSelectionModel = m_treeView->selectionModel();
-        if (oldSelectionModel && newSelectionModel != oldSelectionModel) {
-            oldSelectionModel->deleteLater();
+        if (newSelectionModel != oldSelectionModel) {
+            // TODO: Remove once QTBUG-49966 is addressed.
+            if (oldSelectionModel) {
+                oldSelectionModel->deleteLater();
+            }
+
+            // Connect to the new selection model.
+            connect(m_treeView->selectionModel(), &QItemSelectionModel::selectionChanged,
+                    this, [this](const QItemSelection &selected) {
+                if (selected.isEmpty()) {
+                    return;
+                }
+
+                m_delayedNavigationTimer->setProperty("index", selected.indexes().first());
+                m_delayedNavigationTimer->start();
+            });
         }
 
         m_treeView->reset();
@@ -252,6 +258,33 @@ SearchSidebar::SearchSidebar(const SearchSidebar *other, QWidget *parent)
     });
 }
 
+void SearchSidebar::setTreeViewModel(QAbstractItemModel *model, bool isRootDecorated)
+{
+    QItemSelectionModel *oldSelectionModel = m_treeView->selectionModel();
+
+    m_treeView->setModel(model);
+    m_treeView->setRootIsDecorated(isRootDecorated);
+
+    QItemSelectionModel *newSelectionModel = m_treeView->selectionModel();
+    if (newSelectionModel != oldSelectionModel) {
+        // TODO: Remove once QTBUG-49966 is addressed.
+        if (oldSelectionModel) {
+            oldSelectionModel->deleteLater();
+        }
+
+        // Connect to the new selection model.
+        connect(m_treeView->selectionModel(), &QItemSelectionModel::selectionChanged,
+                this, [this](const QItemSelection &selected) {
+            if (selected.isEmpty()) {
+                return;
+            }
+
+            m_delayedNavigationTimer->setProperty("index", selected.indexes().first());
+            m_delayedNavigationTimer->start();
+        });
+    }
+}
+
 SearchSidebar *SearchSidebar::clone(QWidget *parent) const
 {
     return new SearchSidebar(this, parent);

diff --git a/src/libs/ui/searchsidebar.h b/src/libs/ui/searchsidebar.h
@@ -71,6 +71,7 @@ private slots:
 private:
     Q_DISABLE_COPY(SearchSidebar)
     explicit SearchSidebar(const SearchSidebar *other, QWidget *parent = nullptr);
+    void setTreeViewModel(QAbstractItemModel *model, bool isRootDecorated);
 
     SearchEdit *m_searchEdit = nullptr;
     bool m_pendingSearchEditFocus = false;