From d9f5e191a6bd32a4dc15b3a3eb34795cda7697dd Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Tue, 30 Oct 2007 19:44:55 +0000 Subject: * fixed drag & drop issue in column view (dropping on files was not possible -> handled as viewport now) * only show the hover-drop-indicator on directories (dropping on file-items is handled like dropping on the viewport) * simplified signature of drop signal (source widget not required anymore) svn path=/trunk/KDE/kdebase/apps/; revision=731129 --- src/dolphincolumnwidget.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/dolphincolumnwidget.cpp') diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp index c212e6ad8..e2670f10d 100644 --- a/src/dolphincolumnwidget.cpp +++ b/src/dolphincolumnwidget.cpp @@ -222,7 +222,11 @@ void DolphinColumnWidget::dragMoveEvent(QDragMoveEvent* event) // TODO: remove this code when the issue #160611 is solved in Qt 4.4 const QModelIndex index = indexAt(event->pos()); setDirtyRegion(m_dropRect); - m_dropRect = visualRect(index); + if (itemForIndex(index).isDir()) { + m_dropRect = visualRect(index); + } else { + m_dropRect.setSize(QSize()); // set as invalid + } setDirtyRegion(m_dropRect); } @@ -231,14 +235,11 @@ void DolphinColumnWidget::dropEvent(QDropEvent* event) const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); if (!urls.isEmpty()) { const QModelIndex index = indexAt(event->pos()); - if (index.isValid()) { - const KFileItem item = itemForIndex(index); - m_view->m_controller->indicateDroppedUrls(urls, - url(), - item, - event->source()); - event->acceptProposedAction(); - } + const KFileItem item = itemForIndex(index); + m_view->m_controller->indicateDroppedUrls(urls, + url(), + item); + event->acceptProposedAction(); } QListView::dropEvent(event); m_dragging = false; -- cgit v1.3