Changeset c617646c2e1a5675791200e7eeb54f111875a559

Timestamp:

26/06/08 07:04:23 (4 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1214456663 -0700

git-parent:

[d89fff7e007bd4bceb55f5446d2f31e672927c1b]

git-author:

Lukas Durfina <lukas.durfina@gmail.com> 1214396744 +0200

Message:

Fix hidding of fullscreen controller after leaving fullscreen

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

Files:

• modules/gui/qt4/components/interface_widgets.cpp (modified) (5 diffs)
• modules/gui/qt4/components/interface_widgets.hpp (modified) (2 diffs)

modules/gui/qt4/components/interface_widgets.cpp

@@ -879 +879 @@
-        : ControlsWidget( _p_i, _p_mi, b_advControls, b_shiny, true ),
-        i_lastPosX( -1 ), i_lastPosY( -1 ), i_hideTimeout( 1 ),
-
+, b_isFullscreen( false )
-{
-    setWindowFlags( Qt::ToolTip );
@@ -977 +977 @@
-    else
-    {
+#ifdef WIN32TRICK
+         if ( windowOpacity() > 0.0 && !fscHidden )
+#else
-         if ( windowOpacity() > 0.0 )
+#endif
-         {
-             /* we should use 0.01 because of 100 pieces ^^^
@@ -1014 +1018 @@
-    int type = event->type();
-
-
+&& b_isFullscreen 
-    {
-        #ifdef WIN32TRICK
@@ -1151 +1155 @@
-    if ( var_GetBool( p_vout, "fullscreen" ) && !b_registered )
-    {
-
+
+
-        var_AddCallback( p_vout, "mouse-moved",
-                        showFullscreenControllCallback, (void *) p_fs );
@@ -1159 +1164 @@
-    if ( !var_GetBool( p_vout, "fullscreen" ) && b_registered )
-    {
+        p_fs->setIsFullscreen( false );
+        p_fs->hide();
-        var_DelCallback( p_vout, "mouse-moved",
-                        showFullscreenControllCallback, (void *) p_fs );
-        b_registered = false;
-    }
-
-    if ( !var_GetBool( p_vout, "fullscreen" ) )
-        p_fs->hide();
-
-    return VLC_SUCCESS;

modules/gui/qt4/components/interface_widgets.hpp

@@ -251 +251 @@
-    virtual ~FullscreenControllerWidget();
-
-
+
+
-    void regFullscreenCallback( vout_thread_t *p_vout );
-
@@ -284 +285 @@
-    int i_hideTimeout;  /* FSC hiding timeout, same as mouse hiding timeout */
-    bool b_mouseIsOver;
+    bool b_isFullscreen;
-
-#ifdef WIN32TRICK