Changeset 9dd6534d551c2e697e186f4397c2fa13b6d0c9c6

Show
Ignore:
Timestamp:
05/10/08 14:11:18 (4 months ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1210421478 +0200
git-parent:

[8e36c7bdbf2cb369233f7dd064cd84d5c73577fe]

git-author:
Rafaël Carré <funman@videolan.org> 1210421478 +0200
Message:

Factorize video-on-top disabling while in fullscreen

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/video_output/msw/events.c

    r8e36c7b r9dd6534  
    12061206            HWND topLevelParent = GetAncestor( p_vout->p_sys->hparent, GA_ROOT ); 
    12071207            ShowWindow( topLevelParent, SW_HIDE ); 
    1208  
    1209             /* Disable "video-on-top" status for main interface if needed */ 
    1210             if( var_GetBool( p_vout, "video-on-top" ) ) 
    1211                 ControlParentWindow( p_vout, VOUT_SET_STAY_ON_TOP, false ); 
    12121208        } 
    12131209 
    …… 
    12361232            SetForegroundWindow( p_vout->p_sys->hparent ); 
    12371233            ShowWindow( hwnd, SW_HIDE ); 
    1238  
    1239             /* Update "video-on-top" status for main interface window, it 
    1240             needs to be updated as we were hiding VOUT_SET_STAY_ON_TOP 
    1241             queries from it while we were in fullscreen mode */ 
    1242             int b_ontop = var_GetBool( p_vout, "video-on-top" ); 
    1243             ControlParentWindow( p_vout, VOUT_SET_STAY_ON_TOP, b_ontop ); 
    12441234        } 
    12451235 
    …… 
    12481238    } 
    12491239 
    1250     { 
    1251         vlc_value_t val; 
    1252         /* Update the object variable and trigger callback */ 
    1253         val.b_bool = p_vout->b_fullscreen; 
    1254         var_Set( p_vout, "fullscreen", val ); 
    1255     } 
     1240    vlc_value_t val; 
     1241    /* Update the object variable and trigger callback */ 
     1242    val.b_bool = p_vout->b_fullscreen; 
     1243    var_Set( p_vout, "fullscreen", val ); 
     1244 
     1245    /* Disable video-on-top while in fullscreen mode */ 
     1246    if( var_GetBool( p_vout, "video-on-top" ) ) 
     1247        ControlParentWindow( p_vout, VOUT_SET_STAY_ON_TOP, !val.b_bool ); 
    12561248}