diff options
| author | al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-11-21 15:10:37 +0000 |
|---|---|---|
| committer | al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-11-21 15:10:37 +0000 |
| commit | 6ed8dbf12ea92548a2f0adaac708b7714cb90cab (patch) | |
| tree | 665697f03c1348d830da6dd9225cd2af70b44585 /Gui | |
| parent | 4dac282b7c2dfd4ff966ed86d93db997bcae3acd (diff) | |
| download | mpv-6ed8dbf12ea92548a2f0adaac708b7714cb90cab.tar.bz2 mpv-6ed8dbf12ea92548a2f0adaac708b7714cb90cab.tar.xz | |
Restore normal/double size GUI functionality ( broken since EWMH fs support ).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14007 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/mplayer/mw.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c index bbc69fbc1e..b2c8f9615d 100644 --- a/Gui/mplayer/mw.c +++ b/Gui/mplayer/mw.c @@ -285,24 +285,28 @@ set_volume: btnSet( evFullScreen,btnReleased ); if ( guiIntfStruct.Playing ) { - appMPlayer.subWindow.isFullScreen=True; - appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth * 2 ) / 2 + wsOrgX; - appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight * 2 ) / 2 + wsOrgY; - appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth * 2; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight * 2; - wsFullScreen( &appMPlayer.subWindow ); - vo_fs=0; + if ( appMPlayer.subWindow.isFullScreen ) + { + mplFullScreen(); + } + wsResizeWindow( &appMPlayer.subWindow, guiIntfStruct.MovieWidth * 2, guiIntfStruct.MovieHeight * 2 ); + wsMoveWindow( &appMPlayer.subWindow, 0, + ( wsMaxX - guiIntfStruct.MovieWidth*2 )/2 + wsOrgX, + ( wsMaxY - guiIntfStruct.MovieHeight*2 )/2 + wsOrgY ); } break; case evNormalSize: btnSet( evFullScreen,btnReleased ); if ( guiIntfStruct.Playing ) { - appMPlayer.subWindow.isFullScreen=True; - appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth ) / 2 + wsOrgX; - appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight ) / 2 + wsOrgY; - appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight; - wsFullScreen( &appMPlayer.subWindow ); - vo_fs=0; + if ( appMPlayer.subWindow.isFullScreen ) + { + mplFullScreen(); + } + wsResizeWindow( &appMPlayer.subWindow, guiIntfStruct.MovieWidth, guiIntfStruct.MovieHeight ); + wsMoveWindow( &appMPlayer.subWindow, 0, + ( wsMaxX - guiIntfStruct.MovieWidth )/2 + wsOrgX, + ( wsMaxY - guiIntfStruct.MovieHeight )/2 + wsOrgY ); break; } else if ( !appMPlayer.subWindow.isFullScreen ) break; case evFullScreen: |