mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 05:37:29 +02:00
Code Issues Releases Wiki Activity

Revert order for drop types.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-11-15 16:17:57 +01:00
parent 34eb23842f
commit dd68808a42
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tomahawk/sourcetree/SourceTreeView.cpp
View File

@@ -774,10 +774,15 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event )
{ {
QTreeView::dragMoveEvent( event ); QTreeView::dragMoveEvent( event );
bool accept = false; if ( DropJob::isDropType( DropJob::Playlist, event->mimeData() ) )
if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Track, DropJob::Append ) )
{ {
// Don't highlight the drop for a playlist, as it won't get added to the playlist but created generally
event->setDropAction( Qt::CopyAction );
event->accept();
}
else if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Track, DropJob::Append ) )
{
bool accept = false;
setDirtyRegion( m_dropRect ); setDirtyRegion( m_dropRect );
const QPoint pos = event->pos(); const QPoint pos = event->pos();
const QModelIndex index = indexAt( pos ); const QModelIndex index = indexAt( pos );
@@ -835,13 +840,6 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event )
event->setDropAction( Qt::CopyAction ); event->setDropAction( Qt::CopyAction );
event->accept(); event->accept();
} }
else if ( DropJob::isDropType( DropJob::Playlist, event->mimeData() ) )
{
// Don't highlight the drop for a playlist, as it won't get added to the playlist but created generally
event->setDropAction( Qt::CopyAction );
event->accept();
return;
}
setDirtyRegion( m_dropRect ); setDirtyRegion( m_dropRect );
} }