normal size

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1766 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 29 insertions, 35 deletions

diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index 90721a1ac8..3859f871de 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -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:
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index e19323a849..d649eb09e6 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -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 );
 }
 
diff --git a/Gui/mplayer/play.h b/Gui/mplayer/play.h
index 77c25eca9b..db45030f4d 100644
--- a/Gui/mplayer/play.h
+++ b/Gui/mplayer/play.h
@@ -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;