[Mplayer-cvslog] CVS: main/Gui/mplayer mw.h,1.8,1.9

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv26951

Modified Files:
	mw.h 
Log Message:
eh. double screen size fix.

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mw.h	30 Aug 2001 10:55:09 -0000	1.8
+++ mw.h	30 Aug 2001 12:08:21 -0000	1.9
@@ -329,23 +329,25 @@
    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.OldX=( wsMaxX - moviewidth ) / 2;
+	  appMPlayer.subWindow.OldY=( wsMaxY - movieheight ) / 2;
 	  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;
+   case evDoubleSize: 
+        if ( mplShMem->Playing ) 
+	 {
+	  appMPlayer.subWindow.isFullScreen=True; 
+	  appMPlayer.subWindow.OldX=( wsMaxX - moviewidth * 2 ) / 2;
+	  appMPlayer.subWindow.OldY=( wsMaxY - movieheight * 2 ) / 2;
+	  appMPlayer.subWindow.OldWidth=moviewidth * 2; appMPlayer.subWindow.OldHeight=movieheight * 2;
+	  wsFullScreen( &appMPlayer.subWindow );
+	  mplResize( appMPlayer.subWindow.X,appMPlayer.subWindow.Y,moviewidth,movieheight );
+	 }
+	break;
 
 // --- timer events
    case evHideMouseCursor: