From 49f881f5ec01014e7b6b0c7fa14abd7e99f605fc Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Sun, 11 Mar 2007 11:13:07 +0000
Subject: Fixed some drag & drop issues: - allow drag & drop inside the view -
 prevent a dragging from a directory into itself - use QModelIndex instead of
 the position

svn path=/trunk/KDE/kdebase/apps/; revision=641451
---
 src/dolphiniconsview.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/dolphiniconsview.cpp')

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index c2ba82d0d..1871bb6d9 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -29,6 +29,7 @@
 #include <kfileitemdelegate.h>
 
 #include <QAbstractProxyModel>
+#include <QPoint>
 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
     QListView(parent),
@@ -107,13 +108,13 @@ void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
 void DolphinIconsView::dropEvent(QDropEvent* event)
 {
     const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-    if (urls.isEmpty() || (event->source() == this)) {
-        QListView::dropEvent(event);
-    }
-    else {
+    if (!urls.isEmpty()) {
+        m_controller->indicateDroppedUrls(urls,
+                                          indexAt(event->pos()),
+                                          event->source());
         event->acceptProposedAction();
-        m_controller->indicateDroppedUrls(urls, event->pos());
     }
+    QListView::dropEvent(event);
 }
 
 void DolphinIconsView::updateGridSize(bool showPreview)
-- 
cgit v1.3