Skip to content

V
vlc-2-2
Commit 081302dd authored by Lukas Durfina's avatar Lukas Durfina Committed by Rafaël Carré
Browse files
Options

Fixes for fullscreen controller 

Signed-off-by: default avatarRafaël Carré <funman@videolan.org>
parent da6227f9
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
modules/gui/qt4/components/interface_widgets.cpp
View file @ 081302dd
...@@ -826,7 +826,11 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, ...@@ -826,7 +826,11 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
QGridLayout *fsLayout = new QGridLayout( this ); QGridLayout *fsLayout = new QGridLayout( this );
controlLayout->setSpacing( 0 ); controlLayout->setSpacing( 0 );
#if QT43
controlLayout->setContentsMargins( 5, 1, 5, 1 ); controlLayout->setContentsMargins( 5, 1, 5, 1 );
#else
controlLayout->setMargin( 5 );
#endif
fsLayout->addWidget( slowerButton, 0, 0 ); fsLayout->addWidget( slowerButton, 0, 0 );
slider->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum); slider->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum);
...@@ -842,7 +846,9 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, ...@@ -842,7 +846,9 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
fsLayout->addWidget( discFrame, 1, 4 ); fsLayout->addWidget( discFrame, 1, 4 );
#ifdef ZVBI_COMPILED
fsLayout->addWidget( telexFrame, 1, 5 ); fsLayout->addWidget( telexFrame, 1, 5 );
#endif
fsLayout->addWidget( advControls, 1, 6, Qt::AlignVCenter ); fsLayout->addWidget( advControls, 1, 6, Qt::AlignVCenter );
...@@ -909,7 +915,8 @@ void FullscreenControllerWidget::slowHideFSC() ...@@ -909,7 +915,8 @@ void FullscreenControllerWidget::slowHideFSC()
p_slowHideTimer->stop(); p_slowHideTimer->stop();
/* the last part of time divided to 100 pieces */ /* the last part of time divided to 100 pieces */
p_slowHideTimer->start( i_hideTimeout / 2 / ( windowOpacity() * 100 ) ); p_slowHideTimer->start(
(int) ( i_hideTimeout / 2 / ( windowOpacity() * 100 ) ) );
} }
else else
{ {
......
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