From 579a1ea6be19e036eed37825b52e651aac3f8f47 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Tue, 18 Dec 2007 20:53:49 +0000 Subject: [PATCH] Revert the whole code regarding the discussed issue. Columns view still show the "forbidden" cursor, so nothing is fixed while reverted. The drop-indicator is shown on files too... so something needs a fix here. Shouldn't be hard anyway CCMAIL: peter.penz@gmx.at CCMAIL: faure@kde.org svn path=/trunk/KDE/kdebase/apps/; revision=750168 --- src/dolphincolumnwidget.cpp | 14 -------------- src/dolphindetailsview.cpp | 14 -------------- src/dolphiniconsview.cpp | 9 +++------ 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp index ab7945ea7..9a500df6b 100644 --- a/src/dolphincolumnwidget.cpp +++ b/src/dolphincolumnwidget.cpp @@ -247,20 +247,6 @@ void DolphinColumnWidget::dragMoveEvent(QDragMoveEvent* event) } } setDirtyRegion(m_dropRect); - - bool destIsDir = false; - if (index.isValid()) { - const KFileItem item = itemForIndex(index); - if (!item.isNull() && item.isDir()) { - m_dropRect = visualRect(index); - destIsDir = true; - } - } else { // dropping on viewport - destIsDir = true; - } - if (destIsDir && event->mimeData()->hasUrls()) { - event->acceptProposedAction(); - } } void DolphinColumnWidget::dropEvent(QDropEvent* event) diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index f58b4cd1e..46752fc95 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -278,20 +278,6 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event) } setDirtyRegion(m_dropRect); } - - bool destIsDir = false; - if (index.isValid()) { - const KFileItem item = itemForIndex(index); - if (!item.isNull() && item.isDir()) { - m_dropRect = visualRect(index); - destIsDir = true; - } - } else { // dropping on viewport - destIsDir = true; - } - if (destIsDir && event->mimeData()->hasUrls()) { - event->acceptProposedAction(); - } } void DolphinDetailsView::dropEvent(QDropEvent* event) diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 8d474f4bc..05b8ed9cc 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -225,17 +225,14 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event) setDirtyRegion(m_dropRect); m_dropRect.setSize(QSize()); // set as invalid - bool destIsDir = false; if (index.isValid()) { const KFileItem item = itemForIndex(index); - if (!item.isNull() && item.isDir()) { + if (!item.isNull()) { m_dropRect = visualRect(index); - destIsDir = true; } - } else { // dropping on viewport - destIsDir = true; } - if (destIsDir && event->mimeData()->hasUrls()) { + if (event->mimeData()->hasUrls()) { + // accept url drops, independently from the destination item event->acceptProposedAction(); } -- 2.47.3