From d7a6430c303bae7b8dc4b71f4999f9244ce91c61 Mon Sep 17 00:00:00 2001 From: pontscho Date: Mon, 26 May 2003 08:45:43 +0000 Subject: From: Ben Low [PATCH] xineramascreen for gmplayer (the right way) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10195 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/mplayer/menu.c | 4 ++-- Gui/mplayer/mw.c | 8 ++++---- Gui/mplayer/play.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'Gui/mplayer') diff --git a/Gui/mplayer/menu.c b/Gui/mplayer/menu.c index f0d72176bf..513746c19d 100644 --- a/Gui/mplayer/menu.c +++ b/Gui/mplayer/menu.c @@ -82,9 +82,9 @@ void mplShowMenu( int mx,int my ) if ( !appMPlayer.menuIsPresent || !appMPlayer.menuBase.Bitmap.Image ) return; x=mx; - if ( x + appMPlayer.menuWindow.Width > wsMaxX ) x=wsMaxX - appMPlayer.menuWindow.Width - 1; + if ( x + appMPlayer.menuWindow.Width > wsMaxX ) x=wsMaxX - appMPlayer.menuWindow.Width - 1 + wsOrgX; y=my; - if ( y + appMPlayer.menuWindow.Height > wsMaxY ) y=wsMaxY - appMPlayer.menuWindow.Height - 1; + if ( y + appMPlayer.menuWindow.Height > wsMaxY ) y=wsMaxY - appMPlayer.menuWindow.Height - 1 + wsOrgY; mplMenuX=x; mplMenuY=y; diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c index a3b4ddce93..b1fec53154 100644 --- a/Gui/mplayer/mw.c +++ b/Gui/mplayer/mw.c @@ -282,8 +282,8 @@ set_volume: if ( guiIntfStruct.Playing ) { appMPlayer.subWindow.isFullScreen=True; - appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth * 2 ) / 2; - appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight * 2 ) / 2; + 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; @@ -294,8 +294,8 @@ set_volume: if ( guiIntfStruct.Playing ) { appMPlayer.subWindow.isFullScreen=True; - appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth ) / 2; - appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight ) / 2; + 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; diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 4977dbe183..37d4cb6782 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -43,14 +43,14 @@ void mplFullScreen( void ) appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight; switch ( appMPlayer.sub.x ) { - case -1: appMPlayer.subWindow.OldX=( wsMaxX / 2 ) - ( appMPlayer.subWindow.OldWidth / 2 ); break; - case -2: appMPlayer.subWindow.OldX=wsMaxX - appMPlayer.subWindow.OldWidth; break; + case -1: appMPlayer.subWindow.OldX=( wsMaxX / 2 ) - ( appMPlayer.subWindow.OldWidth / 2 ) + wsOrgX; break; + case -2: appMPlayer.subWindow.OldX=wsMaxX - appMPlayer.subWindow.OldWidth + wsOrgX; break; default: appMPlayer.subWindow.OldX=appMPlayer.sub.x; break; } switch ( appMPlayer.sub.y ) { - case -1: appMPlayer.subWindow.OldY=( wsMaxY / 2 ) - ( appMPlayer.subWindow.OldHeight / 2 ); break; - case -2: appMPlayer.subWindow.OldY=wsMaxY - appMPlayer.subWindow.OldHeight; break; + case -1: appMPlayer.subWindow.OldY=( wsMaxY / 2 ) - ( appMPlayer.subWindow.OldHeight / 2 ) + wsOrgY; break; + case -2: appMPlayer.subWindow.OldY=wsMaxY - appMPlayer.subWindow.OldHeight + wsOrgY; break; default: appMPlayer.subWindow.OldY=appMPlayer.sub.y; break; } } -- cgit v1.2.3