[vlc-devel] commit: Fix 'pausing does move the slider to 0'. (Jean-Baptiste Kempf )

git version control git at videolan.org
Sat Sep 6 03:37:51 CEST 2008


vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Fri Sep  5 18:00:14 2008 -0700| [e2f633e39ffa9e27c852a6f6f2c4db59b2a229cd] | committer: Jean-Baptiste Kempf 

Fix 'pausing does move the slider to 0'.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e2f633e39ffa9e27c852a6f6f2c4db59b2a229cd
---

 modules/gui/qt4/components/interface_widgets.cpp |    2 +-
 modules/gui/qt4/util/input_slider.cpp            |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index efc9d45..17ca316 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -965,7 +965,7 @@ void ControlsWidget::enableInput( bool enable )
 {
     slowerButton->setEnabled( enable );
     slider->setEnabled( enable );
-    slider->setSliderPosition ( 0 );
+    if( !enable ) slider->setSliderPosition ( -1 );
     fasterButton->setEnabled( enable );
 
     /* Advanced Buttons too */
diff --git a/modules/gui/qt4/util/input_slider.cpp b/modules/gui/qt4/util/input_slider.cpp
index dab8571..f0d9eab 100644
--- a/modules/gui/qt4/util/input_slider.cpp
+++ b/modules/gui/qt4/util/input_slider.cpp
@@ -56,7 +56,10 @@ InputSlider::InputSlider( Qt::Orientation q,QWidget *_parent ) :
 void InputSlider::setPosition( float pos, int a, int b )
 {
     if( pos == -1.0 )
+    {
         setEnabled( false );
+        b_sliding = false;
+    }
     else
         setEnabled( true );
 




More information about the vlc-devel mailing list