X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7bd8a826f40b3973d127d32f8f00a625c08d1c1d..bd925ea49a7e4e7c6e652f4529dcd0c4e25fd19a:/src/treeviewsidebarpage.h

diff --git a/src/treeviewsidebarpage.h b/src/treeviewsidebarpage.h
index ec0907ac2..a389077a9 100644
--- a/src/treeviewsidebarpage.h
+++ b/src/treeviewsidebarpage.h
@@ -62,13 +62,6 @@ protected:
     virtual void contextMenuEvent(QContextMenuEvent* event);
 
 private slots:
-    /**
-     * Expands the tree in a way that the item with the URL m_selectedUrl
-     * gets visible. Is called by TreeViewSidebarPage::updateSelection()
-     * if the dir lister has been completed.
-     */
-    void expandSelectionParent();
-
     /**
      * Updates the active view to the URL
      * which is given by the item with the index \a index.
@@ -85,7 +78,13 @@ private slots:
      * Invokes expandToLeafDir() asynchronously (the expanding
      * may not be done in the context of this slot).
      */
-    void triggerExpanding(const QModelIndex& index);
+    void triggerExpanding();
+
+    /**
+     * Invokes loadSubTree() asynchronously (the loading
+     * may not be done in the context of this slot).
+     */
+    void triggerLoadSubTree();
 
     /**
      * Expands all directories to make m_leafDir visible and
@@ -101,17 +100,9 @@ private slots:
     void loadSubTree();
 
     /**
-     * Is invoked when the directory lister has started the loading
-     * of the URL \a url and sets the internal m_dirListerCompleted
-     * state to false.
+     * Assures that the leaf folder gets visible.
      */
-    void slotDirListerStarted(const KUrl& url);
-
-    /**
-     * Is invoked when the directory lister has completed the loading
-     * and sets the internal m_dirListerCompleted state to true.
-     */
-    void slotDirListerCompleted();
+    void scrollToLeaf();
 
 private:
     /**
@@ -121,8 +112,16 @@ private:
      */
     void loadTree(const KUrl& url);
 
+    /**
+     * Selects the current leaf directory m_leafDir and assures
+     * that the directory is visible if the leaf has been set by
+     * TreeViewSidebarPage::setUrl().
+     */
+    void selectLeafDirectory();
+
 private:
-    bool m_dirListerCompleted;
+    bool m_setLeafVisible;
+    int m_horizontalPos;
     KDirLister* m_dirLister;
     DolphinModel* m_dolphinModel;
     DolphinSortFilterProxyModel* m_proxyModel;