summaryrefslogtreecommitdiffstats
path: root/Gui/mplayer/sw.h
diff options
context:
space:
mode:
Diffstat (limited to 'Gui/mplayer/sw.h')
-rw-r--r--Gui/mplayer/sw.h36
1 files changed, 4 insertions, 32 deletions
diff --git a/Gui/mplayer/sw.h b/Gui/mplayer/sw.h
index fd780cec9e..256ac50fc7 100644
--- a/Gui/mplayer/sw.h
+++ b/Gui/mplayer/sw.h
@@ -44,13 +44,6 @@ void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
break;
// ---
case wsPLMouseButton:
- if ( appMPlayer.subWindow.isFullScreen )
- {
- if( ++SubVisible%2 ) wsMoveTopWindow( &appMPlayer.mainWindow );
- else wsMoveTopWindow( &appMPlayer.subWindow );
- mplSubMoved=1;
- break;
- }
gtkShow( evHidePopUpMenu,NULL );
sx=X; sy=Y;
msButton=wsPLMouseButton;
@@ -69,32 +62,11 @@ void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
}
break;
case wsRLMouseButton:
- if ( !mplSubMoved )
+ if ( ( !mplSubMoved )&&( appMPlayer.subWindow.isFullScreen ) )
{
-#if 0
- if( SubVisible++%2 )
- {
- wsMoveTopWindow( &appMPlayer.mainWindow );
- fprintf( stderr,"[sw] MAIN TOP\n" );
- }
- else
- {
- 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
- }
+ if( SubVisible++%2 ) wsMoveTopWindow( &appMPlayer.mainWindow );
+ else wsMoveTopWindow( &appMPlayer.subWindow );
+ }
msButton=0;
mplSubMoved=0;
break;