Fix of showing FS controller when it is slowly hidding

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index d90ef7693cf9f8871f18640ff31d160ccf902302..6c2abaca29807339fbd1e845fc33761f1257b537 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -975,7 +975,7 @@ void FullscreenControllerWidget::customEvent( QEvent *event )
         #endif
 
 #if HAVE_TRANSPARENCY
-        setWindowOpacity( 0.75 );
+        setWindowOpacity( DEFAULT_OPACITY );
 #endif
     }
     else if ( type == FullscreenControlHide_Type )
@@ -1122,7 +1122,7 @@ static int showFullscreenControllCallback( vlc_object_t *vlc_object, const char
 {
     FullscreenControllerWidget *p_fs = (FullscreenControllerWidget *) data;
 
-    if ( p_fs->isFSCHidden() )
+    if ( p_fs->isFSCHidden() || p_fs->windowOpacity() < DEFAULT_OPACITY )
     {
         IMEvent *event = new IMEvent( FullscreenControlShow_Type, 0 );
         QApplication::postEvent( p_fs, static_cast<QEvent *>(event) );

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 512e15f5e368d0e4463a4d36264dcbafd96cd1d1..9767483884757320408efd0cc31ad98f8dcb8f28 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -57,6 +57,9 @@
     #define HAVE_TRANSPARENCY 1
 #endif
 
+/* Default value of opacity for FS controller */
+#define DEFAULT_OPACITY 0.75
+
 class ResizeEvent;
 class QPalette;
 class QPixmap;