diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp index d6f1dae7b..1a24ac6ff 100644 --- a/src/playlist/playlistmanager.cpp +++ b/src/playlist/playlistmanager.cpp @@ -44,7 +44,7 @@ PlaylistManager::PlaylistManager( QObject* parent ) m_splitter->addWidget( m_stack ); m_splitter->addWidget( m_queueView ); - m_splitter->hide( 1 ); + m_splitter->hide( 1, false ); m_widget->layout()->setMargin( 0 ); m_widget->layout()->addWidget( m_splitter ); diff --git a/src/utils/animatedsplitter.cpp b/src/utils/animatedsplitter.cpp index d3ba00c00..3271d7c9c 100644 --- a/src/utils/animatedsplitter.cpp +++ b/src/utils/animatedsplitter.cpp @@ -3,6 +3,8 @@ #include <QDebug> #include <QTimeLine> +#define ANIMATION_TIME 300 + AnimatedSplitter::AnimatedSplitter( QWidget* parent ) : QSplitter( parent ) @@ -14,11 +16,12 @@ AnimatedSplitter::AnimatedSplitter( QWidget* parent ) void -AnimatedSplitter::show( int index ) +AnimatedSplitter::show( int index, bool animate ) { if ( m_greedyIndex < 0 ) return; + int time = animate ? ANIMATION_TIME : 0; m_animateIndex = index; QWidget* w = widget( index ); @@ -27,7 +30,7 @@ AnimatedSplitter::show( int index ) m_greedyHeight = widget( m_greedyIndex )->height(); - QTimeLine *timeLine = new QTimeLine( 300, this ); + QTimeLine *timeLine = new QTimeLine( time, this ); timeLine->setFrameRange( w->height(), size.height() ); timeLine->setUpdateInterval( 10 ); timeLine->setCurveShape( QTimeLine::EaseOutCurve ); @@ -41,11 +44,12 @@ AnimatedSplitter::show( int index ) void -AnimatedSplitter::hide( int index ) +AnimatedSplitter::hide( int index, bool animate ) { if ( m_greedyIndex < 0 ) return; + int time = animate ? ANIMATION_TIME : 0; m_animateIndex = index; QWidget* w = widget( index ); @@ -53,7 +57,7 @@ AnimatedSplitter::hide( int index ) m_greedyHeight = widget( m_greedyIndex )->height(); - QTimeLine *timeLine = new QTimeLine( 300, this ); + QTimeLine *timeLine = new QTimeLine( time, this ); timeLine->setFrameRange( 25, w->height() ); timeLine->setUpdateInterval( 10 ); timeLine->setDirection( QTimeLine::Backward ); diff --git a/src/utils/animatedsplitter.h b/src/utils/animatedsplitter.h index 54176cc37..1d54db968 100644 --- a/src/utils/animatedsplitter.h +++ b/src/utils/animatedsplitter.h @@ -10,8 +10,8 @@ Q_OBJECT public: explicit AnimatedSplitter( QWidget* parent = 0 ); - void show( int index ); - void hide( int index ); + void show( int index, bool animate = true ); + void hide( int index, bool animate = true ); void setGreedyWidget( int index ) { m_greedyIndex = index; }