[vlc-devel] commit: Do not touch the always-on-top when going fullscreen ( Rafaël Carré )

git version control git at videolan.org
Sat May 10 18:20:29 CEST 2008


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat May 10 18:19:42 2008 +0200| [937e898593c4bf108c3b02d349b940e6667d7f83]

Do not touch the always-on-top when going fullscreen

It needs to be done by the GUI only

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

 modules/video_output/msw/events.c  |    4 ----
 modules/video_output/x11/xcommon.c |   11 +----------
 2 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index c86c2b5..2245bd6 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -1241,8 +1241,4 @@ void Win32ToggleFullscreen( vout_thread_t *p_vout )
     /* 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 );
 }
diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index b37ae25..10acaa1 100644
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -1493,17 +1493,8 @@ static int ManageVideo( vout_thread_t *p_vout )
      */
     if ( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
     {
-        vlc_value_t val_fs, val_ontop;
-
         /* Update the object variable and trigger callback */
-        val_fs.b_bool = !p_vout->b_fullscreen;
-
-        var_Set( p_vout, "fullscreen", val_fs );
-
-        /* Disable "always on top" in fullscreen mode */
-        var_Get( p_vout, "video-on-top", &val_ontop );
-        if( val_ontop.b_bool )
-            WindowOnTop( p_vout, !val_fs.b_bool );
+        var_SetBool( p_vout, "fullscreen", !p_vout->b_fullscreen );
 
         ToggleFullScreen( p_vout );
         p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;




More information about the vlc-devel mailing list