mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 09:04:33 +02:00
Code Issues Releases Wiki Activity

Speed up drag & drop moves over sidebar.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2016-02-22 21:57:22 +01:00
parent 2d141ccb5e
commit 61a15cafac
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -796,20 +796,21 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event )
{ {
QTreeView::dragMoveEvent( event ); QTreeView::dragMoveEvent( event );
bool accept = false;
if ( DropJob::isDropType( DropJob::Playlist, event->mimeData() ) ) 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 // 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->setDropAction( Qt::CopyAction );
event->accept(); accept = true;
} }
else if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Track, DropJob::Append ) ) 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 );
dataChanged( m_dropIndex, m_dropIndex );
m_dropIndex = QPersistentModelIndex( index ); if ( index != m_dropIndex )
dataChanged( m_dropIndex, m_dropIndex );
if ( index.isValid() ) if ( index.isValid() )
{ {
@@ -828,7 +829,8 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event )
case SourcesModel::CategoryAdd: case SourcesModel::CategoryAdd:
case SourcesModel::Source: //drop to send tracks to peers case SourcesModel::Source: //drop to send tracks to peers
m_delegate->hovered( index, event->mimeData() ); m_delegate->hovered( index, event->mimeData() );
dataChanged( index, index ); if ( index != m_dropIndex )
dataChanged( index, index );
break; break;
default: default:
@@ -844,24 +846,28 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event )
m_dropRect = QRect(); m_dropRect = QRect();
} }
if ( accept || DropJob::isDropType( DropJob::Playlist, event->mimeData() ) ) if ( accept )
{ {
// Playlists are accepted always since they can be dropped anywhere // Playlists are accepted always since they can be dropped anywhere
//tDebug() << Q_FUNC_INFO << "Accepting"; //tDebug() << Q_FUNC_INFO << "Accepting";
event->setDropAction( Qt::CopyAction ); event->setDropAction( Qt::CopyAction );
event->accept();
}
else
{
// tDebug() << Q_FUNC_INFO << "Ignoring";
event->ignore();
} }
m_dropIndex = QPersistentModelIndex( index );
} }
else if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Playlist | DropJob::Artist | DropJob::Album, DropJob::Create ) ) else if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Playlist | DropJob::Artist | DropJob::Album, DropJob::Create ) )
{ {
event->setDropAction( Qt::CopyAction ); event->setDropAction( Qt::CopyAction );
accept = true;
}
if ( accept )
{
event->accept(); event->accept();
} }
else
{
event->ignore();
}
setDirtyRegion( m_dropRect ); setDirtyRegion( m_dropRect );
} }