request the activation of a column also on directories if not the left mouse button is pressed

svn path=/trunk/KDE/kdebase/apps/; revision=696094

1 files changed, 10 insertions, 2 deletions

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 59a36d9f6..f4a5ef19a 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -60,7 +60,7 @@ public:
 
     void obtainSelectionModel();
     void releaseSelectionModel();
-    
+
 protected:
     virtual QStyleOptionViewItem viewOptions() const;
     virtual void dragEnterEvent(QDragEnterEvent* event);
@@ -144,7 +144,7 @@ void ColumnWidget::setActive(bool active)
     } else {
         releaseSelectionModel();
     }
-    
+
     if (m_active == active) {
         return;
     }
@@ -255,6 +255,14 @@ void ColumnWidget::mousePressEvent(QMouseEvent* event)
             } else if (item->isDir()) {
                 m_childUrl = item->url();
                 viewport()->update();
+
+                // Only request the activation if not the left button is pressed.
+                // The left button on a directory opens a new column, hence requesting
+                // an activation is useless as the new column will request the activation
+                // afterwards.
+                if (event->button() != Qt::LeftButton) {
+                    m_view->requestActivation(this);
+                }
             } else {
                 m_view->requestActivation(this);
             }