From b453d80808aeebe2376780e874fec68fa96e0574 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 25 Jun 2012 22:56:03 +0200
Subject: [PATCH] * Re-center play/pause buttons when resizing GridView.

---
 src/libtomahawk/playlist/GridItemDelegate.cpp | 20 +++++++++++--------
 src/libtomahawk/playlist/GridItemDelegate.h   |  3 ++-
 src/libtomahawk/playlist/GridView.cpp         |  2 ++
 src/libtomahawk/playlist/GridView.h           |  1 +
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/libtomahawk/playlist/GridItemDelegate.cpp b/src/libtomahawk/playlist/GridItemDelegate.cpp
index 4568c1705..1b34116da 100644
--- a/src/libtomahawk/playlist/GridItemDelegate.cpp
+++ b/src/libtomahawk/playlist/GridItemDelegate.cpp
@@ -56,7 +56,8 @@ GridItemDelegate::GridItemDelegate( QAbstractItemView* parent, PlayableProxyMode
     if ( m_view && m_view->metaObject()->indexOfSignal( "modelChanged()" ) > -1 )
         connect( m_view, SIGNAL( modelChanged() ), this, SLOT( modelChanged() ) );
 
-    connect( m_view, SIGNAL( scrolledContents( int, int ) ), SLOT( onScrolled( int, int ) ) );
+    connect( m_view, SIGNAL( scrolledContents( int, int ) ), SLOT( onViewChanged() ) );
+    connect( m_view, SIGNAL( resized() ), SLOT( onViewChanged() ) );
 }
 
 
@@ -421,19 +422,22 @@ GridItemDelegate::doUpdateIndex( const QPersistentModelIndex& idx )
 
 
 void
-GridItemDelegate::onScrolled( int dx, int dy )
+GridItemDelegate::onViewChanged()
 {
-    foreach ( QWidget* widget, m_spinner.values() )
+    foreach ( const QPersistentModelIndex& index, m_spinner.keys() )
     {
-        widget->move( widget->pos() + QPoint( dx, dy ) );
+        QRect rect = m_view->visualRect( index );
+        m_spinner.value( index )->move( rect.center() - QPoint( 23, 23 ) );
     }
-    foreach ( ImageButton* button, m_playButton.values() )
+    foreach ( const QPersistentModelIndex& index, m_playButton.keys() )
     {
-        button->move( button->pos() + QPoint( dx, dy ) );
+        QRect rect = m_view->visualRect( index );
+        m_playButton.value( index )->move( rect.center() - QPoint( 23, 23 ) );
     }
-    foreach ( ImageButton* button, m_pauseButton.values() )
+    foreach ( const QPersistentModelIndex& index, m_pauseButton.keys() )
     {
-        button->move( button->pos() + QPoint( dx, dy ) );
+        QRect rect = m_view->visualRect( index );
+        m_pauseButton.value( index )->move( rect.center() - QPoint( 23, 23 ) );
     }
 }
 
diff --git a/src/libtomahawk/playlist/GridItemDelegate.h b/src/libtomahawk/playlist/GridItemDelegate.h
index d2caa9999..89474a91b 100644
--- a/src/libtomahawk/playlist/GridItemDelegate.h
+++ b/src/libtomahawk/playlist/GridItemDelegate.h
@@ -55,7 +55,7 @@ private slots:
     void modelChanged();
     void doUpdateIndex( const QPersistentModelIndex& idx );
 
-    void onScrolled( int dx, int dy );
+    void onViewChanged();
     void onPlaybackStarted( const QPersistentModelIndex& index );
     void onPlaybackFinished();
 
@@ -64,6 +64,7 @@ private slots:
 
     void fadingFrameChanged( const QPersistentModelIndex& );
     void fadingFrameFinished( const QPersistentModelIndex& );
+
 private:
     QTimeLine* createTimeline( QTimeLine::Direction direction );
 
diff --git a/src/libtomahawk/playlist/GridView.cpp b/src/libtomahawk/playlist/GridView.cpp
index de1204bf4..220dc8ad3 100644
--- a/src/libtomahawk/playlist/GridView.cpp
+++ b/src/libtomahawk/playlist/GridView.cpp
@@ -208,6 +208,8 @@ GridView::resizeEvent( QResizeEvent* event )
 {
     QListView::resizeEvent( event );
     layoutItems();
+
+    emit resized();
 }
 
 
diff --git a/src/libtomahawk/playlist/GridView.h b/src/libtomahawk/playlist/GridView.h
index 30557b0f1..4326f84ed 100644
--- a/src/libtomahawk/playlist/GridView.h
+++ b/src/libtomahawk/playlist/GridView.h
@@ -78,6 +78,7 @@ public slots:
 signals:
     void modelChanged();
     void scrolledContents( int dx, int dy );
+    void resized();
 
 protected:
     virtual void startDrag( Qt::DropActions supportedActions );