So I guess that is the behaviour that we really want :)

CCMAIL: peter.penz@gmx.at

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

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 9a500df6b379f234e198256c97aebaf4a24e1cc1..75d83bd0f9e7dd3278ea3c07e5f0a8e34575b26c 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -247,6 +247,11 @@ void DolphinColumnWidget::dragMoveEvent(QDragMoveEvent* event)
         }
     }
     setDirtyRegion(m_dropRect);
+
+    if (event->mimeData()->hasUrls()) {
+        // accept url drops, independently from the destination item
+        event->acceptProposedAction();
+    }
 }
 
 void DolphinColumnWidget::dropEvent(QDropEvent* event)

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 46752fc95a39870bac6a84256d8cded1678ee1dc..886f3f9a66637a69b338e58793e08c5d91039302 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -278,6 +278,11 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
         }
         setDirtyRegion(m_dropRect);
     }
+
+    if (event->mimeData()->hasUrls()) {
+        // accept url drops, independently from the destination item
+        event->acceptProposedAction();
+    }
 }
 
 void DolphinDetailsView::dropEvent(QDropEvent* event)

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 05b8ed9cc16a88bb468ecb3c37784a0115841979..de0aaec97c1ed7391982a236efa4a117d3eb95f6 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -227,8 +227,10 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event)
     m_dropRect.setSize(QSize()); // set as invalid
     if (index.isValid()) {
         const KFileItem item = itemForIndex(index);
-        if (!item.isNull()) {
+        if (!item.isNull() && item.isDir()) {
             m_dropRect = visualRect(index);
+        } else {
+            m_dropRect.setSize(QSize()); // set as invalid
         }
     }
     if (event->mimeData()->hasUrls()) {