Backport:

* Always take the root of an URL as root for the treeview (using a matching Places-URL leads to serious usability issues - see bug #150941 for details).

* Don't reset the horizontal scrollbar position when expanding/reloading the tree.

BUG: 150941

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

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 3196fe7bd77395e8ee03d8405db8103aecbce3c4..7fa56566af056a9add6cb2cba09b8a74fc7b4e9c 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -34,10 +34,12 @@
 #include <QTreeView>
 #include <QBoxLayout>
 #include <QModelIndex>
 #include <QTreeView>
 #include <QBoxLayout>
 #include <QModelIndex>

+#include <QScrollBar>

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

+    m_horizontalPos(0),

     m_dirLister(0),
     m_dolphinModel(0),
     m_proxyModel(0),
     m_dirLister(0),
     m_dolphinModel(0),
     m_proxyModel(0),


@@ -216,20 +218,16 @@ void TreeViewSidebarPage::loadTree(const KUrl& url)
     Q_ASSERT(m_dirLister != 0);
     m_leafDir = url;
 
     Q_ASSERT(m_dirLister != 0);
     m_leafDir = url;
 

-    // adjust the root of the tree to the base place
-    KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
-    KUrl baseUrl = placesModel->url(placesModel->closestItem(url));
-    if (!baseUrl.isValid()) {
-        // it's possible that no closest item is available and hence an
-        // empty URL is returned
-        if (url.isLocalFile()) {
-            // use the root directory as base for local URLs
-            baseUrl = KUrl("file:///");
-        } else {
-            // clear the path for non-local URLs and use it as base
-            baseUrl = url;
-            baseUrl.setPath(QString());
-        }
+    m_horizontalPos = m_treeView->horizontalScrollBar()->value();
+
+    KUrl baseUrl = url;
+    if (url.isLocalFile()) {
+        // use the root directory as base for local URLs
+        baseUrl = KUrl("file:///");
+    } else {
+        // clear the path for non-local URLs and use it as base
+        baseUrl = url;
+        baseUrl.setPath(QString());

     }
 
     if (m_dirLister->url() != baseUrl) {
     }
 
     if (m_dirLister->url() != baseUrl) {


@@ -244,6 +242,9 @@ void TreeViewSidebarPage::selectLeafDirectory()
 {
     const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
     const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
 {
     const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
     const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);

+    if (!proxyIndex.isValid()) {
+        return;
+    }

 
     if (m_setLeafVisible) {
         m_treeView->scrollTo(proxyIndex);
 
     if (m_setLeafVisible) {
         m_treeView->scrollTo(proxyIndex);


@@ -252,6 +253,8 @@ void TreeViewSidebarPage::selectLeafDirectory()
 
     QItemSelectionModel* selModel = m_treeView->selectionModel();
     selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
 
     QItemSelectionModel* selModel = m_treeView->selectionModel();
     selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);

+
+    m_treeView->horizontalScrollBar()->setValue(m_horizontalPos);

 }
 
 #include "treeviewsidebarpage.moc"
 }
 
 #include "treeviewsidebarpage.moc"

diff --git a/src/treeviewsidebarpage.h b/src/treeviewsidebarpage.h
index d0c3850e925ee639414a68bd70efc2159fa04a3e..9ff37ed062e6953b300e64df0c2a5a7dd8e5df1c 100644 (file)
--- a/src/treeviewsidebarpage.h
+++ b/src/treeviewsidebarpage.h
@@ -116,7 +116,7 @@ private:
 
 private:
     bool m_setLeafVisible;
 
 private:
     bool m_setLeafVisible;

-    bool m_dirListerCompleted;
+    int m_horizontalPos;

     KDirLister* m_dirLister;
     DolphinModel* m_dolphinModel;
     DolphinSortFilterProxyModel* m_proxyModel;
     KDirLister* m_dirLister;
     DolphinModel* m_dolphinModel;
     DolphinSortFilterProxyModel* m_proxyModel;