Commit 937e8985 authored by Rafaël Carré's avatar Rafaël Carré

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

It needs to be done by the GUI only
parent d9752f14
...@@ -1241,8 +1241,4 @@ void Win32ToggleFullscreen( vout_thread_t *p_vout ) ...@@ -1241,8 +1241,4 @@ void Win32ToggleFullscreen( vout_thread_t *p_vout )
/* Update the object variable and trigger callback */ /* Update the object variable and trigger callback */
val.b_bool = p_vout->b_fullscreen; val.b_bool = p_vout->b_fullscreen;
var_Set( p_vout, "fullscreen", val ); 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 );
} }
...@@ -1493,17 +1493,8 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -1493,17 +1493,8 @@ static int ManageVideo( vout_thread_t *p_vout )
*/ */
if ( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE ) if ( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
{ {
vlc_value_t val_fs, val_ontop;
/* Update the object variable and trigger callback */ /* Update the object variable and trigger callback */
val_fs.b_bool = !p_vout->b_fullscreen; var_SetBool( p_vout, "fullscreen", !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 );
ToggleFullScreen( p_vout ); ToggleFullScreen( p_vout );
p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment