From c9a8b04b95735a65cca9411f4a2c61c525d5304e Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Sun, 27 Feb 2011 17:06:12 -0500
Subject: [PATCH] fix some painting glitches

---
 .../playlist/dynamic/DynamicView.cpp          | 21 ++++++++++++-------
 .../playlist/dynamic/DynamicView.h            |  1 +
 .../dynamic/echonest/EchonestControl.cpp      |  3 +--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/libtomahawk/playlist/dynamic/DynamicView.cpp b/src/libtomahawk/playlist/dynamic/DynamicView.cpp
index 531777045..0b48ca37f 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicView.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicView.cpp
@@ -42,6 +42,7 @@ DynamicView::DynamicView( QWidget* parent )
         , m_checkOnCollapse( false )
         , m_working( false )
         , m_fadebg( false )
+        , m_fadeOnly( false )
 {
     setContentsMargins( 0, 0, 0, 0 );
     setFrameShape( QFrame::NoFrame );
@@ -182,23 +183,27 @@ DynamicView::collapseEntries( int startRow, int num, int numToKeep )
 
     /// Two options: Either we are overflowing our view, or we're not. If we are, it's because the search for a playable track
     /// went past the limit of the view. Just fade out from the beginning to the end in that case. otherwise, animate a slide
-    bool justFade = false;
     int realNum = num;
     QModelIndex last = indexAt( QPoint( 3, viewport()->height() - 3 ) );
     if( last.isValid() && last.row() < startRow + num ) {
-        justFade = true;
-        realNum = last.row();
+        m_fadeOnly = true;
+        realNum = last.row() - startRow;
+    } else {
+        m_fadeOnly = false;
     }
+    
      // we capture the image of the rows we're going to collapse
     // then we capture the image of the target row we're going to animate downwards
     // then we fade the first image out while sliding the second image up.
     QModelIndex topLeft = proxyModel()->index( startRow, 0, QModelIndex() );
     QModelIndex bottomRight = proxyModel()->index( startRow + realNum - 1, proxyModel()->columnCount( QModelIndex() ) - 1, QModelIndex() );
     QItemSelection sel( topLeft, bottomRight );
+    qDebug() << "Created selection from:" << startRow << "to" << startRow + realNum - 1;
     QRect fadingRect = visualRegionForSelection( sel ).boundingRect();
     QRect fadingRectViewport = fadingRect; // all values that we use in paintEvent() have to be in viewport coords
     fadingRect.moveTo( viewport()->mapTo( this, fadingRect.topLeft() ) );
-
+    //fadingRect.setBottom( qMin( fadingRect.bottom(), viewport()->mapTo( this, viewport()->rect().bottomLeft() ).y() ) ); // limit what we capture to the viewport rect, if the last item is partially obscured
+    
     m_fadingIndexes = QPixmap::grabWidget( this, fadingRect ); // but all values we use to grab the widgetr have to be in scrollarea coords :(
     m_fadingPointAnchor = QPoint( 0, fadingRectViewport.topLeft().y() );
 
@@ -207,9 +212,9 @@ DynamicView::collapseEntries( int startRow, int num, int numToKeep )
 
     m_fadeOutAnim.start();
     
-    qDebug() << "Grabbed fading indexes from rect:" << fadingRect << m_fadingIndexes.size();
+    qDebug() << "Grabbed fading indexes from rect:" << fadingRect << m_fadingIndexes.size() << "ANCHORED:" << m_fadingPointAnchor;
 
-    if( !justFade ) {
+    if( !m_fadeOnly ) {
     /// sanity checks. make sure we have all the rows we need
         int firstSlider = startRow + realNum;
         qDebug() << "Sliding from" << firstSlider << "number:" << numToKeep - 1 << "rowcount is:" << proxyModel()->rowCount();
@@ -298,9 +303,9 @@ DynamicView::paintEvent( QPaintEvent* event )
         p.save();
         QRect bg = m_fadingIndexes.rect();
         bg.moveTo( m_fadingPointAnchor ); // cover up the background
+        p.fillRect( bg, Qt::white );
         if( m_fadebg ) {
             p.save();
-            p.fillRect( bg, Qt::white );
             p.setOpacity( 1 - m_fadeOutAnim.currentValue() );
         }
         p.drawPixmap( bg, m_bg );
@@ -315,7 +320,7 @@ DynamicView::paintEvent( QPaintEvent* event )
         if( m_slideAnim.state() == QTimeLine::Running ) {
             // draw the collapsing entry
             p.drawPixmap( 0, m_slideAnim.currentFrame(), m_slidingIndex );
-        } else if( m_fadeOutAnim.state() == QTimeLine::Running ) {
+        } else if( m_fadeOutAnim.state() == QTimeLine::Running && !m_fadeOnly ) {
             p.drawPixmap( 0, m_bottomAnchor.y(), m_slidingIndex );
         }
     }
diff --git a/src/libtomahawk/playlist/dynamic/DynamicView.h b/src/libtomahawk/playlist/dynamic/DynamicView.h
index 26a63e4f1..66ecabeee 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicView.h
+++ b/src/libtomahawk/playlist/dynamic/DynamicView.h
@@ -82,6 +82,7 @@ private:
     QPixmap m_slidingIndex;
     QPixmap m_bg;
     bool m_fadebg;
+    bool m_fadeOnly;
     QTimeLine m_fadeOutAnim;
     QTimeLine m_slideAnim;
 };
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
index 283cb8b29..f1036b9c2 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
@@ -183,8 +183,7 @@ Tomahawk::EchonestControl::updateWidgets()
         
         
         connect( input->slider(), SIGNAL( valueChanged( int ) ), this, SLOT( updateData() ) );
-        connect( input->slider(), SIGNAL( sliderMoved( int ) ), this, SLOT( editingFinished() ) );
-        connect( input->slider(), SIGNAL( sliderMoved( int ) ), &m_editingTimer, SLOT( stop() ) );
+        connect( input->slider(), SIGNAL( valueChanged( int ) ), this, SLOT( editingFinished() ) );
         
         match->hide();
         input->hide();