[vlc-devel] commit: Factorize video-on-top disabling while in fullscreen ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat May 10 14:11:18 2008 +0200| [9dd6534d551c2e697e186f4397c2fa13b6d0c9c6]

Factorize video-on-top disabling while in fullscreen

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9dd6534d551c2e697e186f4397c2fa13b6d0c9c6
---

 modules/video_output/msw/events.c |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 5f04f0c..c86c2b5 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -1205,10 +1205,6 @@ void Win32ToggleFullscreen( vout_thread_t *p_vout )
 
             HWND topLevelParent = GetAncestor( p_vout->p_sys->hparent, GA_ROOT );
             ShowWindow( topLevelParent, SW_HIDE );
-
-            /* Disable "video-on-top" status for main interface if needed */
-            if( var_GetBool( p_vout, "video-on-top" ) )
-                ControlParentWindow( p_vout, VOUT_SET_STAY_ON_TOP, false );
         }
 
         SetForegroundWindow( hwnd );
@@ -1235,22 +1231,18 @@ void Win32ToggleFullscreen( vout_thread_t *p_vout )
             ShowWindow( topLevelParent, SW_SHOW );
             SetForegroundWindow( p_vout->p_sys->hparent );
             ShowWindow( hwnd, SW_HIDE );
-
-            /* Update "video-on-top" status for main interface window, it
-            needs to be updated as we were hiding VOUT_SET_STAY_ON_TOP
-            queries from it while we were in fullscreen mode */
-            int b_ontop = var_GetBool( p_vout, "video-on-top" );
-            ControlParentWindow( p_vout, VOUT_SET_STAY_ON_TOP, b_ontop );
         }
 
         /* Make sure the mouse cursor is displayed */
         PostMessage( p_vout->p_sys->hwnd, WM_VLC_SHOW_MOUSE, 0, 0 );
     }
 
-    {
-        vlc_value_t val;
-        /* Update the object variable and trigger callback */
-        val.b_bool = p_vout->b_fullscreen;
-        var_Set( p_vout, "fullscreen", val );
-    }
+    vlc_value_t val;
+    /* Update the object variable and trigger callback */
+    val.b_bool = p_vout->b_fullscreen;
+    var_Set( p_vout, "fullscreen", val );
+
+    /* Disable video-on-top while in fullscreen mode */
+    if( var_GetBool( p_vout, "video-on-top" ) )
+        ControlParentWindow( p_vout, VOUT_SET_STAY_ON_TOP, !val.b_bool );
 }