From 74fa9411599c1426680d215fefd7ef7398ed0a57 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <mzanetti@kde.org>
Date: Mon, 22 Aug 2011 21:28:52 +0200
Subject: [PATCH] fix bug where non expanded items were tracked expanded ones

---
 src/sourcetree/animationhelper.cpp | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/sourcetree/animationhelper.cpp b/src/sourcetree/animationhelper.cpp
index 3e8c79a4c..42b496e64 100644
--- a/src/sourcetree/animationhelper.cpp
+++ b/src/sourcetree/animationhelper.cpp
@@ -61,20 +61,21 @@ void AnimationHelper::expand()
 
 void AnimationHelper::collapse( bool immediately )
 {
-    m_fullyExpanded = false;
-    m_expandTimer.stop();
+    if ( m_expandTimer.isActive() )
+    {
+        m_expandTimer.stop();
+        emit finished( m_index );
+        return;
+    }
 
     if ( immediately )
     {
         m_forceClosing = true;
-        if ( m_size != m_startSize )
-            m_collapseAnimation->start();
+        m_fullyExpanded = false;
+        m_collapseAnimation->start();
     }
     else
-    {
-        if ( m_size != m_startSize )
-            m_collapseTimer.start();
-    }
+        m_collapseTimer.start();
 }
 
 bool AnimationHelper::partlyExpanded()
@@ -95,14 +96,11 @@ bool AnimationHelper::fullyExpanded()
 void AnimationHelper::expandTimeout()
 {
     m_expandAnimation->start();
-//        m_fullyExpanded = true;
 }
 
 void AnimationHelper::collapseTimeout()
 {
-//        m_size = m_startSize;
-        m_fullyExpanded = false;
-//        emit finished( m_index );
+    m_fullyExpanded = false;
     m_collapseAnimation->start();
 }
 
@@ -113,6 +111,5 @@ void AnimationHelper::expandAnimationFinished()
 
 void AnimationHelper::collapseAnimationFinished()
 {
-    m_fullyExpanded = false;
     emit finished( m_index );
 }