RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

normal size 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1766 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2001-08-30 10:55:17 +00:00
parent 6fc0377d0d
commit b194ee83af
4 changed files with 32 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Gui/mplayer/mw.h
View File

@ -125,8 +125,6 @@ void PutImage( txSample * bf,int x,int y,int max,int ofs )
}
}
extern float gui_position;
void mplMainDraw( wsParamDisplay )
{
wItem * item;
@ -328,8 +326,26 @@ NoPause:
case evIncAudioBufDelay: mplIncAudioBufDelay(); break;
case evDecAudioBufDelay: mplDecAudioBufDelay(); break;
case evNormalSize: if ( mplShMem->Playing ) wsResizeWindow( &appMPlayer.subWindow,mplwidth,mplheight ); break;
case evDoubleSize: if ( mplShMem->Playing ) wsResizeWindow( &appMPlayer.subWindow,mplwidth * 2,mplheight * 2 ); break;
case evNormalSize:
if ( mplShMem->Playing )
{
// wsWindowDecoration( &appMPlayer.subWindow,appMPlayer.subWindow.Decorations );
// wsWindowDecoration( &appMPlayer.subWindow,0 );
// appMPlayer.subWindow.isFullScreen=0;
// wsMoveWindow( &appMPlayer.subWindow,appMPlayer.subWindow.OldX,appMPlayer.subWindow.OldY );
// wsResizeWindow( &appMPlayer.subWindow,moviewidth,movieheight );
appMPlayer.subWindow.isFullScreen=True;
appMPlayer.subWindow.OldWidth=moviewidth; appMPlayer.subWindow.OldHeight=movieheight;
wsFullScreen( &appMPlayer.subWindow );
mplResize( appMPlayer.subWindow.X,appMPlayer.subWindow.Y,moviewidth,movieheight );
}
// else
// {
// wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
// wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
// }
break;
// case evDoubleSize: if ( mplShMem->Playing ) wsResizeWindow( &appMPlayer.subWindow,mplwidth * 2,mplheight * 2 ); break;
// --- timer events
case evHideMouseCursor:

32
Gui/mplayer/play.c
View File

@ -7,7 +7,7 @@
int mplParent = 1;
int mplx,mply,mplwidth,mplheight;
int moviex,moviey,moviewidth,movieheight;
#include "../app.h"
@ -37,32 +37,10 @@ void mplPlayerThread( void )
void mplFullScreen( void )
{
if ( appMPlayer.subWindow.isFullScreen )
{
if ( mplShMem->Playing )
{
appMPlayer.subWindow.OldX=mplx;
appMPlayer.subWindow.OldY=mply;
appMPlayer.subWindow.OldWidth=mplwidth;
appMPlayer.subWindow.OldHeight=mplheight;
}
else
{
appMPlayer.subWindow.OldWidth=appMPlayer.sub.width;
appMPlayer.subWindow.OldHeight=appMPlayer.sub.height;
appMPlayer.subWindow.OldX=( wsMaxX - appMPlayer.sub.width ) / 2;
appMPlayer.subWindow.OldY=( wsMaxY - appMPlayer.sub.height ) / 2;
}
}
else
{
mplx=appMPlayer.subWindow.X;
mply=appMPlayer.subWindow.Y;
mplwidth=appMPlayer.subWindow.Width;
mplheight=appMPlayer.subWindow.Height;
}
wsFullScreen( &appMPlayer.subWindow );
// wsMoveTopWindow( &appMPlayer.subWindow );
// if ( appMPlayer.subWindow.isFullScreen )
// {
// }
wsFullScreen( &appMPlayer.subWindow );
mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height );
}

8
Gui/mplayer/play.h
View File

@ -53,10 +53,10 @@ extern char * Filename;
extern int mplParent;
extern int mplx;
extern int mply;
extern int mplwidth;
extern int mplheight;
extern int moviex;
extern int moviey;
extern int moviewidth;
extern int movieheight;
extern mplCommStruct * mplShMem;

7
mplayer.c
View File

@ -963,10 +963,9 @@ current_module="init_libvo";
#ifdef HAVE_NEW_GUI
if ( use_gui )
{
if ( !appMPlayer.subWindow.isFullScreen )
wsResizeWindow( &appMPlayer.subWindow,sh_video->disp_w,sh_video->disp_h );
screen_size_x=appMPlayer.subWindow.Width;
screen_size_y=appMPlayer.subWindow.Height;
if ( !appMPlayer.subWindow.isFullScreen ) wsResizeWindow( &appMPlayer.subWindow,sh_video->disp_w,sh_video->disp_h );
moviewidth=screen_size_x=appMPlayer.subWindow.Width;
movieheight=screen_size_y=appMPlayer.subWindow.Height;
}
#endif