fixed some activation issues in combination with split views

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index c405eeb8bff3b6ab60e895d6f308e51592e0537a..6a3f4bf187661d1442e1e4e8785e91adde25180d 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -28,7 +28,6 @@
 #include "dolphin_detailsmodesettings.h"
 
 #include <kdirmodel.h>
-#include <kfileitemdelegate.h>
 
 #include <QApplication>
 #include <QHeaderView>
@@ -156,15 +155,18 @@ void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
 
 void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
 {
-    if (!indexAt(event->pos()).isValid()) {
+    m_controller->triggerActivation();
+
+    QTreeView::mousePressEvent(event);
+
+    const QModelIndex index = indexAt(event->pos());
+    if (!index.isValid() || (index.column() != KDirModel::Name)) {
         const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
         if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
             clearSelection();
         }
     }
 
-    QTreeView::mousePressEvent(event);
-
     if (event->button() == Qt::LeftButton) {
         m_showElasticBand = true;
 
@@ -191,7 +193,6 @@ void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
         updateElasticBand();
         m_showElasticBand = false;
     }
-    m_controller->triggerActivation();
 }
 
 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
@@ -221,11 +222,15 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
     QTreeView::dragMoveEvent(event);
 
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
-    const QPoint pos(0, event->pos().y());
-    const QModelIndex index = indexAt(pos);
-    setDirtyRegion(m_dropRect);
-    m_dropRect = visualRect(index);
     setDirtyRegion(m_dropRect);
+    const QModelIndex index = indexAt(event->pos());
+    if (!index.isValid() || (index.column() != KDirModel::Name)) {
+        m_dragging = false;
+    } else {
+        m_dragging = true;
+        m_dropRect = visualRect(index);
+        setDirtyRegion(m_dropRect);
+    }
 }
 
 void DolphinDetailsView::dropEvent(QDropEvent* event)