mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-27 07:44:34 +02:00
Code Issues Releases Wiki Activity

fix bug where non expanded items were tracked expanded ones

Browse Source
This commit is contained in:
Michael Zanetti
2011-08-22 21:28:52 +02:00
parent 559433162f
commit 74fa941159
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/sourcetree/animationhelper.cpp
View File

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