From 175bc80002942996fb1f7f45f02f1425e49c9be9 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 12 Apr 2015 06:38:58 +0200 Subject: [PATCH] Work around nasty drag & drop issue. --- src/tomahawk/sourcetree/SourceTreeView.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/tomahawk/sourcetree/SourceTreeView.cpp b/src/tomahawk/sourcetree/SourceTreeView.cpp index e31dbb37b..be96ae436 100644 --- a/src/tomahawk/sourcetree/SourceTreeView.cpp +++ b/src/tomahawk/sourcetree/SourceTreeView.cpp @@ -885,8 +885,13 @@ SourceTreeView::dropEvent( QDropEvent* event ) return; }*/ + QTreeView::dropEvent( event ); + if ( event->isAccepted() ) + { + tDebug() << Q_FUNC_INFO << "Ignoring accepted event!"; + } // if it's a playlist drop, accept it anywhere in the sourcetree by manually parsing it. - if ( DropJob::isDropType( DropJob::Playlist, event->mimeData() ) ) + else if ( DropJob::isDropType( DropJob::Playlist, event->mimeData() ) ) { DropJob* dropThis = new DropJob; dropThis->setDropTypes( DropJob::Playlist ); @@ -895,12 +900,12 @@ SourceTreeView::dropEvent( QDropEvent* event ) // Don't add it to the playlist under drop, it's a new playlist now event->acceptProposedAction(); - return; + event->accept(); } - - if ( model()->dropMimeData( event->mimeData(), event->proposedAction(), index.row(), 0, index.parent() ) ) + else if ( model()->dropMimeData( event->mimeData(), event->proposedAction(), index.row(), 0, index.parent() ) ) { event->acceptProposedAction(); + event->accept(); } m_dragging = false;