From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 28 Jul 2008 18:19:30 +0000 (-0700)
Subject: Fullscreen controller button reordering to fix consistency with main toolbar (complai... 
X-Git-Tag: 0.9.0-test3~180
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=39670df97892b3ef4be6edd28e39826804f51cff;p=vlc

Fullscreen controller button reordering to fix consistency with main toolbar (complaints from forum).
---

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index c891f7828b..fb724d3d41 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -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 );