X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fc97fa250d89c620a99d58d0a787a648d680fb31..629ec98952bcf38bc99f2b11bc37bdc2ec7aabcc:/src/treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 6c89e762b..d5f5f4053 100644
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -31,6 +31,7 @@
 #include <kdirlister.h>
 #include <kfileitem.h>
 
+#include <QApplication>
 #include <QItemSelection>
 #include <QTreeView>
 #include <QBoxLayout>
@@ -41,6 +42,7 @@
 TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     SidebarPage(parent),
     m_setLeafVisible(false),
+    m_mouseButtons(Qt::NoButton),
     m_dirLister(0),
     m_dolphinModel(0),
     m_proxyModel(0),
@@ -135,6 +137,8 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
                 this, SLOT(updateActiveView(const QModelIndex&)));
         connect(m_treeView, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&)),
                 this, SLOT(dropUrls(const KUrl::List&, const QModelIndex&)));
+        connect(m_treeView, SIGNAL(pressed(const QModelIndex&)),
+                this, SLOT(updateMouseButtons()));
 
         QVBoxLayout* layout = new QVBoxLayout(this);
         layout->setMargin(0);
@@ -166,7 +170,7 @@ void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
     const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
     const KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
     if (!item.isNull()) {
-        emit changeUrl(item.url());
+        emit changeUrl(item.url(), m_mouseButtons);
     }
 }
 
@@ -210,6 +214,8 @@ void TreeViewSidebarPage::expandToLeafDir()
 
 void TreeViewSidebarPage::loadSubTree()
 {
+    m_treeView->selectionModel()->clearSelection();
+
     if (m_leafDir.isParentOf(m_dirLister->url())) {
         // The leaf directory is not a child of the base URL, hence
         // no sub directory must be loaded or selected.
@@ -236,6 +242,11 @@ void TreeViewSidebarPage::scrollToLeaf()
     }
 }
 
+void TreeViewSidebarPage::updateMouseButtons()
+{
+    m_mouseButtons = QApplication::mouseButtons();
+}
+
 void TreeViewSidebarPage::loadTree(const KUrl& url)
 {
     Q_ASSERT(m_dirLister != 0);