Commit 83dbe964 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Fix very annoying typo that discard most of the correct layout.

And fix sizing of FSC accordingly.
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent a862c2a4
......@@ -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 );
......
......@@ -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 )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment