From 0e04e8970b60051bfbcbf14ad9aadc95f0fc715b Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 11 Jul 2011 02:49:46 +0200
Subject: [PATCH] * Try to force updates when hovered item in a TrackView
 changes.

---
 .../infoplugins/generic/musicbrainzPlugin.cpp |  2 -
 src/libtomahawk/playlist/trackview.cpp        | 46 ++++++++++++++-----
 src/libtomahawk/playlist/trackview.h          |  3 ++
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.cpp
index 31efbd7c8..89292f44c 100644
--- a/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.cpp
+++ b/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.cpp
@@ -128,8 +128,6 @@ MusicBrainzPlugin::artistSearchSlot()
     }
 
     QString artist_id = domNodeList.at( 0 ).toElement().attribute( "id" );
-    qDebug() << Q_FUNC_INFO << "FOOBAR:" << artist_id;
-
     QString requestString( "http://musicbrainz.org/ws/2/release?status=official&type=album|ep" );
     QUrl url( requestString );
     url.addQueryItem( "artist", artist_id );
diff --git a/src/libtomahawk/playlist/trackview.cpp b/src/libtomahawk/playlist/trackview.cpp
index b058638ff..9246e5e0b 100644
--- a/src/libtomahawk/playlist/trackview.cpp
+++ b/src/libtomahawk/playlist/trackview.cpp
@@ -439,23 +439,20 @@ TrackView::onMenuTriggered( int action )
 
 
 void
-TrackView::leaveEvent( QEvent* event )
+TrackView::updateHoverIndex( const QPoint& pos )
 {
-    m_hoveredIndex = QModelIndex();
-    setCursor( Qt::ArrowCursor );
-}
+    QModelIndex idx = indexAt( pos );
 
-
-void
-TrackView::mouseMoveEvent( QMouseEvent* event )
-{
-    QModelIndex idx = indexAt( event->pos() );
-    m_hoveredIndex = idx;
+    if ( idx != m_hoveredIndex )
+    {
+        m_hoveredIndex = idx;
+        repaint();
+    }
 
     if ( idx.column() == TrackModel::Artist || idx.column() == TrackModel::Album )
     {
-        if ( event->pos().x() > header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) - 16 &&
-             event->pos().x() < header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) )
+        if ( pos.x() > header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) - 16 &&
+             pos.x() < header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) )
         {
             setCursor( Qt::PointingHandCursor );
             return;
@@ -466,9 +463,34 @@ TrackView::mouseMoveEvent( QMouseEvent* event )
 }
 
 
+void
+TrackView::wheelEvent( QWheelEvent* event )
+{
+    QTreeView::wheelEvent( event );
+    updateHoverIndex( event->pos() );
+}
+
+
+void
+TrackView::leaveEvent( QEvent* event )
+{
+    QTreeView::leaveEvent( event );
+    updateHoverIndex( QPoint( -1, -1 ) );
+}
+
+
+void
+TrackView::mouseMoveEvent( QMouseEvent* event )
+{
+    QTreeView::mouseMoveEvent( event );
+    updateHoverIndex( event->pos() );
+}
+
+
 void
 TrackView::mousePressEvent( QMouseEvent* event )
 {
+    QTreeView::mousePressEvent( event );
     QModelIndex idx = indexAt( event->pos() );
 
     if ( event->pos().x() > header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) - 16 &&
diff --git a/src/libtomahawk/playlist/trackview.h b/src/libtomahawk/playlist/trackview.h
index 2a297d007..4b47d2d0d 100644
--- a/src/libtomahawk/playlist/trackview.h
+++ b/src/libtomahawk/playlist/trackview.h
@@ -75,6 +75,7 @@ protected:
     virtual void dragMoveEvent( QDragMoveEvent* event );
     virtual void dropEvent( QDropEvent* event );
 
+    void wheelEvent( QWheelEvent* event );
     void mouseMoveEvent( QMouseEvent* event );
     void mousePressEvent( QMouseEvent* event );
     void leaveEvent( QEvent* event );
@@ -88,6 +89,8 @@ private slots:
     void onCustomContextMenu( const QPoint& pos );
 
 private:
+    void updateHoverIndex( const QPoint& pos );
+
     QString m_guid;
     TrackModel* m_model;
     TrackProxyModel* m_proxyModel;