Mercurial > mplayer.hg
diff Gui/mplayer/sw.h @ 5919:60cf2bca993f
some bug fix
author | pontscho |
---|---|
date | Wed, 01 May 2002 09:29:06 +0000 |
parents | b8d8d72776f2 |
children | b5fb9a927bf3 |
line wrap: on
line diff
--- a/Gui/mplayer/sw.h Tue Apr 30 23:29:38 2002 +0000 +++ b/Gui/mplayer/sw.h Wed May 01 09:29:06 2002 +0000 @@ -6,6 +6,8 @@ void mplSubDraw( wsParamDisplay ) { + if ( appMPlayer.subWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit ); + if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible++; if ( !appMPlayer.subWindow.Mapped || @@ -37,7 +39,7 @@ msButton=wsPRMouseButton; break; case wsRRMouseButton: - mplHideMenu( RX,RY ); + mplHideMenu( RX,RY,1 ); msButton=0; break; // --- @@ -67,9 +69,9 @@ } break; case wsRLMouseButton: -// if ( ( !mplSubMoved )&&( ( SubVisible++%2 ) ) ) wsMoveTopWindow( &appMPlayer.mainWindow ); if ( !mplSubMoved ) { +#if 0 if( SubVisible++%2 ) { wsMoveTopWindow( &appMPlayer.mainWindow ); @@ -80,6 +82,18 @@ wsMoveTopWindow( &appMPlayer.subWindow ); fprintf( stderr,"[sw] SUB TOP\n" ); } +#else + if ( appMPlayer.subWindow.Focused == 2 ) + { + wsMoveTopWindow( &appMPlayer.mainWindow ); + fprintf( stderr,"[sw] MAIN TOP\n" ); + } + else + { + wsMoveTopWindow( &appMPlayer.subWindow ); + fprintf( stderr,"[sw] SUB TOP\n" ); + } +#endif } msButton=0; mplSubMoved=0;