* Views handle leaveEvents now and inform the delegate to update itself when required.

src/libtomahawk/playlist/GridView.cpp

@@ -195,6 +195,15 @@ GridView::scrollContentsBy( int dx, int dy )
 }
 
 
+void
+GridView::leaveEvent( QEvent* event )
+{
+    QListView::leaveEvent( event );
+
+    m_delegate->resetHoverIndex();
+}
+
+
 void
 GridView::paintEvent( QPaintEvent* event )
 {

src/libtomahawk/playlist/GridView.h

@@ -89,6 +89,7 @@ protected:
     virtual void startDrag( Qt::DropActions supportedActions );
     virtual void scrollContentsBy( int dx, int dy );
 
+    void leaveEvent( QEvent* event );
     void paintEvent( QPaintEvent* event );
     void resizeEvent( QResizeEvent* event );
     void wheelEvent( QWheelEvent* );

src/libtomahawk/playlist/TrackView.cpp

@@ -166,8 +166,7 @@ TrackView::setProxyModel( PlayableProxyModel* model )
     connect( m_proxyModel, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), SLOT( verifySize() ) );
 
     m_delegate = new PlaylistItemDelegate( this, m_proxyModel );
-    setItemDelegate( m_delegate );
-
+    QTreeView::setItemDelegate( m_delegate );
     QTreeView::setModel( m_proxyModel );
 }
 
@@ -184,8 +183,11 @@ TrackView::setModel( QAbstractItemModel* model )
 void
 TrackView::setPlaylistItemDelegate( PlaylistItemDelegate* delegate )
 {
+    if ( m_delegate )
+        delete m_delegate;
+
     m_delegate = delegate;
-    setItemDelegate( delegate );
+    QTreeView::setItemDelegate( delegate );
 
     verifySize();
 }
@@ -511,7 +513,6 @@ TrackView::dragMoveEvent( QDragMoveEvent* event )
 void
 TrackView::dragLeaveEvent( QDragLeaveEvent* event )
 {
-    tDebug() << Q_FUNC_INFO;
     QTreeView::dragLeaveEvent( event );
 
     m_dragging = false;
@@ -550,6 +551,15 @@ TrackView::dropEvent( QDropEvent* event )
 }
 
 
+void
+TrackView::leaveEvent( QEvent* event )
+{
+    QTreeView::leaveEvent( event );
+
+    m_delegate->resetHoverIndex();
+}
+
+
 void
 TrackView::paintEvent( QPaintEvent* event )
 {

src/libtomahawk/playlist/TrackView.h

@@ -113,6 +113,7 @@ protected:
     virtual void dragMoveEvent( QDragMoveEvent* event );
     virtual void dropEvent( QDropEvent* event );
 
+    virtual void leaveEvent( QEvent* event );
     virtual void paintEvent( QPaintEvent* event );
     virtual void keyPressEvent( QKeyEvent* event );
     virtual void wheelEvent( QWheelEvent* event );