]> git.sesse.net Git - vlc/commitdiff
Fullscreen controller button reordering to fix consistency with main toolbar (complai...
authorJean-Baptiste Kempf <jb@videolan.org>
Mon, 28 Jul 2008 18:19:30 +0000 (11:19 -0700)
committerJean-Baptiste Kempf <jb@videolan.org>
Mon, 28 Jul 2008 18:19:30 +0000 (11:19 -0700)
modules/gui/qt4/components/interface_widgets.cpp

index c891f7828be3bf5813f2d80f0b2da2a3e045f72f..fb724d3d41dc7ece3e4588c578f3d67e8eab08d5 100644 (file)
@@ -910,25 +910,22 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
     QGridLayout *fsLayout = new QGridLayout( this );
     fsLayout->setLayoutMargins( 5, 1, 5, 1, 5 );
 
-    fsLayout->addWidget( slowerButton, 0, 0 );
+    /* 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( volMuteLabel, 1, 0);
-    fsLayout->addWidget( volumeSlider, 1, 1 );
-
-    fsLayout->addLayout( controlButLayout, 1, 2 );
-
-    fsLayout->addWidget( playButton, 1, 3 );
-
-    fsLayout->addWidget( discFrame, 1, 4 );
-
-    fsLayout->addWidget( telexFrame, 1, 5 );
+    fsLayout->addWidget( playButton, 1, 0 );
+    fsLayout->addLayout( controlButLayout, 1, 1 );
 
-    fsLayout->addWidget( advControls, 1, 6, Qt::AlignVCenter );
+    fsLayout->addWidget( discFrame, 1, 2 );
+    fsLayout->addWidget( telexFrame, 1, 3 );
+    fsLayout->addWidget( advControls, 1, 4, Qt::AlignVCenter );
+    fsLayout->addWidget( fullscreenButton, 1, 5 );
 
-    fsLayout->addWidget( fullscreenButton, 1, 7 );
+    fsLayout->addWidget( volMuteLabel, 1, 6);
+    fsLayout->addWidget( volumeSlider, 1, 7 );
 
     /* hiding timer */
     p_hideTimer = new QTimer( this );