[vlc-devel] commit: Fix very annoying typo that discard most of the correct layout. ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Sun Aug 24 20:15:47 2008 -0700| [507f771ebe836974a451682e7e9f2ee3741a12e4] | committer: Christophe Mutricy 

Fix very annoying typo that discard most of the correct layout.
And fix sizing of FSC accordingly.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 83dbe964fba007a79265dde6aaaee673c49fac5a)

Signed-off-by: Christophe Mutricy <xtophe at videolan.org>

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

 modules/gui/qt4/components/interface_widgets.cpp |   12 +++++++-----
 modules/gui/qt4/qt4.hpp                          |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index d91580f..8fc9193 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -1008,13 +1008,14 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
     setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
 
     QGridLayout *fsLayout = new QGridLayout( this );
-    fsLayout->setLayoutMargins( 5, 1, 5, 1, 5 );
+    fsLayout->setLayoutMargins( 5, 2, 5, 2, 5 );
 
     /* First line */
     slider->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum);
+    slider->setMinimumWidth( 220 );
     fsLayout->addWidget( slowerButton, 0, 0 );
-    fsLayout->addWidget( slider, 0, 1, 1, 8 );
-    fsLayout->addWidget( fasterButton, 0, 9 );
+    fsLayout->addWidget( slider, 0, 1, 1, 9 );
+    fsLayout->addWidget( fasterButton, 0, 10 );
 
     fsLayout->addWidget( playButton, 1, 0, 1, 2 );
     fsLayout->addLayout( controlButLayout, 1, 2 );
@@ -1024,8 +1025,9 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
     fsLayout->addWidget( fullscreenButton, 1, 5 );
     fsLayout->addWidget( advControls, 1, 6, Qt::AlignVCenter );
 
-    fsLayout->addWidget( volMuteLabel, 1, 7 );
-    fsLayout->addWidget( volumeSlider, 1, 8, 1, 2 );
+    fsLayout->setColumnStretch( 7, 10 );
+    fsLayout->addWidget( volMuteLabel, 1, 8 );
+    fsLayout->addWidget( volumeSlider, 1, 9, 1, 2 );
 
     /* hiding timer */
     p_hideTimer = new QTimer( this );
diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 0d16bc3..ef19b84 100644
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -103,7 +103,7 @@ struct intf_sys_t
 #define TOGGLEV( x ) { if( x->isVisible() ) x->hide();          \
             else  x->show(); }
 
-#if QT43
+#if HAS_QT43
     #define setLayoutMargins( a, b, c, d, e) setContentsMargins( a, b, c, d )
 #else
     #define setLayoutMargins( a, b, c, d, e) setMargin( e )