From 081302dd85a4f6c2593ee5ac1d8f1a6c6e929a5b Mon Sep 17 00:00:00 2001 From: Lukas Durfina Date: Tue, 10 Jun 2008 12:02:39 +0200 Subject: [PATCH] Fixes for fullscreen controller MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafaël Carré --- modules/gui/qt4/components/interface_widgets.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp index 6a7a7eb582..4413a6e3f5 100644 --- a/modules/gui/qt4/components/interface_widgets.cpp +++ b/modules/gui/qt4/components/interface_widgets.cpp @@ -826,7 +826,11 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, QGridLayout *fsLayout = new QGridLayout( this ); controlLayout->setSpacing( 0 ); + #if QT43 controlLayout->setContentsMargins( 5, 1, 5, 1 ); + #else + controlLayout->setMargin( 5 ); + #endif fsLayout->addWidget( slowerButton, 0, 0 ); slider->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum); @@ -842,7 +846,9 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, fsLayout->addWidget( discFrame, 1, 4 ); + #ifdef ZVBI_COMPILED fsLayout->addWidget( telexFrame, 1, 5 ); + #endif fsLayout->addWidget( advControls, 1, 6, Qt::AlignVCenter ); @@ -909,7 +915,8 @@ void FullscreenControllerWidget::slowHideFSC() p_slowHideTimer->stop(); /* 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 { -- 2.20.1