mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-19 12:21:52 +02:00
Code Issues Releases Wiki Activity

Now using a QEasingCurve::OutBack for the queue animation.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2010-11-27 05:50:56 +01:00
parent cef7883fd6
commit 9b59e296f0
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/utils/animatedsplitter.cpp
View File

@@ -3,7 +3,7 @@
#include <QDebug> #include <QDebug>
#include <QTimeLine> #include <QTimeLine>
#define ANIMATION_TIME 300 #define ANIMATION_TIME 500
AnimatedSplitter::AnimatedSplitter( QWidget* parent ) AnimatedSplitter::AnimatedSplitter( QWidget* parent )
@@ -18,7 +18,7 @@ AnimatedSplitter::AnimatedSplitter( QWidget* parent )
void void
AnimatedSplitter::show( int index, bool animate ) AnimatedSplitter::show( int index, bool animate )
{ {
if ( m_greedyIndex < 0 ) if ( m_greedyIndex < 0 || m_animateIndex != -1 )
return; return;
m_animateIndex = index; m_animateIndex = index;
@@ -35,8 +35,8 @@ AnimatedSplitter::show( int index, bool animate )
QTimeLine *timeLine = new QTimeLine( ANIMATION_TIME, this ); QTimeLine *timeLine = new QTimeLine( ANIMATION_TIME, this );
timeLine->setFrameRange( w->height(), size.height() ); timeLine->setFrameRange( w->height(), size.height() );
timeLine->setUpdateInterval( 10 ); timeLine->setUpdateInterval( 5 );
timeLine->setCurveShape( QTimeLine::EaseOutCurve ); timeLine->setEasingCurve( QEasingCurve::OutBack );
connect( timeLine, SIGNAL( frameChanged( int ) ), SLOT( onAnimationStep( int ) ) ); connect( timeLine, SIGNAL( frameChanged( int ) ), SLOT( onAnimationStep( int ) ) );
connect( timeLine, SIGNAL( finished() ), SLOT( onAnimationFinished() ) ); connect( timeLine, SIGNAL( finished() ), SLOT( onAnimationFinished() ) );
@@ -55,13 +55,14 @@ AnimatedSplitter::show( int index, bool animate )
void void
AnimatedSplitter::hide( int index, bool animate ) AnimatedSplitter::hide( int index, bool animate )
{ {
if ( m_greedyIndex < 0 ) if ( m_greedyIndex < 0 || m_animateIndex != -1 )
return; return;
m_animateIndex = index; m_animateIndex = index;
QWidget* w = widget( index ); QWidget* w = widget( index );
qDebug() << "SizeHint:" << index << w->height(); qDebug() << "SizeHint:" << index << w->height();
w->setMinimumHeight( 25 );
m_greedyHeight = widget( m_greedyIndex )->height(); m_greedyHeight = widget( m_greedyIndex )->height();
m_animateForward = false; m_animateForward = false;
@@ -70,9 +71,9 @@ AnimatedSplitter::hide( int index, bool animate )
QTimeLine *timeLine = new QTimeLine( ANIMATION_TIME, this ); QTimeLine *timeLine = new QTimeLine( ANIMATION_TIME, this );
timeLine->setFrameRange( 25, w->height() ); timeLine->setFrameRange( 25, w->height() );
timeLine->setUpdateInterval( 10 ); timeLine->setUpdateInterval( 5 );
timeLine->setDirection( QTimeLine::Backward ); timeLine->setDirection( QTimeLine::Backward );
timeLine->setCurveShape( QTimeLine::EaseOutCurve ); timeLine->setEasingCurve( QEasingCurve::OutBack );
connect( timeLine, SIGNAL( frameChanged( int ) ), SLOT( onAnimationStep( int ) ) ); connect( timeLine, SIGNAL( frameChanged( int ) ), SLOT( onAnimationStep( int ) ) );
connect( timeLine, SIGNAL( finished() ), SLOT( onAnimationFinished() ) ); connect( timeLine, SIGNAL( finished() ), SLOT( onAnimationFinished() ) );
@@ -179,10 +180,11 @@ AnimatedSplitter::onAnimationFinished()
QWidget* w = widget( m_animateIndex ); QWidget* w = widget( m_animateIndex );
if ( m_animateForward ) if ( m_animateForward )
{
w->setMinimumHeight( 100 ); w->setMinimumHeight( 100 );
}
else else
{ {
w->setMinimumHeight( 25 );
w->setMaximumHeight( 25 ); w->setMaximumHeight( 25 );
} }