As the Qt-issue 160611 is solved in Qt4.4 and Fredrik has improved KFileItemDelegate, it is not necessary anymore drawing a custom drag & drop indication.

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

1 files changed, 1 insertions, 16 deletions

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 11b993849..2eb631a64 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -49,7 +49,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     m_controller(controller),
     m_font(),
     m_decorationSize(),
-    m_dragging(false),
     m_showElasticBand(false),
     m_elasticBandOrigin(),
     m_elasticBandDestination()
@@ -261,15 +260,11 @@ void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
         updateElasticBand();
         m_showElasticBand = false;
     }
-    m_dragging = true;
 }
 
 void DolphinDetailsView::dragLeaveEvent(QDragLeaveEvent* event)
 {
     QTreeView::dragLeaveEvent(event);
-
-    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
-    m_dragging = false;
     setDirtyRegion(m_dropRect);
 }
 
@@ -280,10 +275,7 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     setDirtyRegion(m_dropRect);
     const QModelIndex index = indexAt(event->pos());
-    if (!index.isValid() || (index.column() != DolphinModel::Name)) {
-        m_dragging = false;
-    } else {
-        m_dragging = true;
+    if (index.isValid() && (index.column() == DolphinModel::Name)) {
         const KFileItem item = m_controller->itemForIndex(index);
         if (!item.isNull() && item.isDir()) {
             m_dropRect = visualRect(index);
@@ -314,7 +306,6 @@ void DolphinDetailsView::dropEvent(QDropEvent* event)
                                           item);
     }
     QTreeView::dropEvent(event);
-    m_dragging = false;
 }
 
 void DolphinDetailsView::paintEvent(QPaintEvent* event)
@@ -335,12 +326,6 @@ void DolphinDetailsView::paintEvent(QPaintEvent* event)
         style()->drawControl(QStyle::CE_RubberBand, &opt, &painter);
         painter.restore();
     }
-
-    // TODO: remove this code when the issue #160611 is solved in Qt 4.4
-    if (m_dragging) {
-        const QBrush& brush = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight);
-        DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush);
-    }
 }
 
 void DolphinDetailsView::keyPressEvent(QKeyEvent* event)