Backport:

treeview: prevent that when expanding a subtree that the selected item gets hidden by the (maybe) appearing horizontal scrollbar

svn path=/branches/KDE/4.0/kdebase/apps/; revision=763550

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 7fa56566af056a9add6cb2cba09b8a74fc7b4e9c..14c8777280d15d775b97ce2dd8291a7642e7e88a 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -35,6 +35,7 @@
 #include <QBoxLayout>
 #include <QModelIndex>
 #include <QScrollBar>
 #include <QBoxLayout>
 #include <QModelIndex>
 #include <QScrollBar>

+#include <QTimer>

 
 TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     SidebarPage(parent),
 
 TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     SidebarPage(parent),


@@ -213,6 +214,15 @@ void TreeViewSidebarPage::loadSubTree()
     }
 }
 
     }
 }
 

+void TreeViewSidebarPage::scrollToLeaf()
+{
+    const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
+    const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+    if (proxyIndex.isValid()) {
+        m_treeView->scrollTo(proxyIndex);
+    }
+}
+

 void TreeViewSidebarPage::loadTree(const KUrl& url)
 {
     Q_ASSERT(m_dirLister != 0);
 void TreeViewSidebarPage::loadTree(const KUrl& url)
 {
     Q_ASSERT(m_dirLister != 0);


@@ -247,7 +257,11 @@ void TreeViewSidebarPage::selectLeafDirectory()
     }
 
     if (m_setLeafVisible) {
     }
 
     if (m_setLeafVisible) {

-        m_treeView->scrollTo(proxyIndex);
+        // Invoke m_treeView->scrollTo(proxyIndex) asynchronously by
+        // scrollToLeaf(). This assures that the scrolling is done after
+        // the horizontal scrollbar gets visible (otherwise the scrollbar
+        // might hide the leaf).
+        QTimer::singleShot(100, this, SLOT(scrollToLeaf()));

         m_setLeafVisible = false;
     }
 
         m_setLeafVisible = false;
     }
 

diff --git a/src/treeviewsidebarpage.h b/src/treeviewsidebarpage.h
index 9ff37ed062e6953b300e64df0c2a5a7dd8e5df1c..a389077a94e7da64ca8aeaf40321abe72201f128 100644 (file)
--- a/src/treeviewsidebarpage.h
+++ b/src/treeviewsidebarpage.h
@@ -99,6 +99,11 @@ private slots:
      */
     void loadSubTree();
 
      */
     void loadSubTree();
 

+    /**
+     * Assures that the leaf folder gets visible.
+     */
+    void scrollToLeaf();
+

 private:
     /**
      * Initializes the base URL of the tree and expands all
 private:
     /**
      * Initializes the base URL of the tree and expands all