Fix "on qt the seek slider is as wide as the interface, not in FS controler" bug

[vlc] / modules / gui / qt4 / components / interface_widgets.cpp

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 8f9596e159adcf5a881a8f4794d1d1084c5b1a42..49092171521e10b3be1349f1a3177f487601e35d 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -238,6 +238,7 @@ void BackgroundWidget::contextMenuEvent( QContextMenuEvent *event )
     QVLCMenu::PopupMenu( p_intf, true );
 }
 
+#if 0
 /**********************************************************************
  * Visualization selector panel
  **********************************************************************/
@@ -286,6 +287,7 @@ void VisualSelector::next()
         free( psz_new );
     }
 }
+#endif
 
 /**********************************************************************
  * TEH controls
@@ -869,6 +871,7 @@ void ControlsWidget::enableInput( bool enable )
 {
     slowerButton->setEnabled( enable );
     slider->setEnabled( enable );
+    slider->setSliderPosition ( 0 );
     fasterButton->setEnabled( enable );
 
     /* Advanced Buttons too */
@@ -922,19 +925,19 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
     /* First line */
     slider->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum);
     fsLayout->addWidget( slowerButton, 0, 0 );
-    fsLayout->addWidget( slider, 0, 1, 1, 6 );
-    fsLayout->addWidget( fasterButton, 0, 7 );
+    fsLayout->addWidget( slider, 0, 1, 1, 8 );
+    fsLayout->addWidget( fasterButton, 0, 9 );
 
-    fsLayout->addWidget( playButton, 1, 0 );
-    fsLayout->addLayout( controlButLayout, 1, 1 );
+    fsLayout->addWidget( playButton, 1, 0, 1, 2 );
+    fsLayout->addLayout( controlButLayout, 1, 2 );
 
-    fsLayout->addWidget( discFrame, 1, 2 );
-    fsLayout->addWidget( telexFrame, 1, 3 );
-    fsLayout->addWidget( advControls, 1, 4, Qt::AlignVCenter );
-    fsLayout->addWidget( fullscreenButton, 1, 5 );
+    fsLayout->addWidget( discFrame, 1, 3 );
+    fsLayout->addWidget( telexFrame, 1, 4 );
+    fsLayout->addWidget( advControls, 1, 5, Qt::AlignVCenter );
+    fsLayout->addWidget( fullscreenButton, 1, 6 );
 
-    fsLayout->addWidget( volMuteLabel, 1, 6);
-    fsLayout->addWidget( volumeSlider, 1, 7 );
+    fsLayout->addWidget( volMuteLabel, 1, 7 );
+    fsLayout->addWidget( volumeSlider, 1, 8, 1, 2 );
 
     /* hiding timer */
     p_hideTimer = new QTimer( this );