[MPlayer-cvslog] CVS: main/libvo vo_quartz.c, 1.52, 1.53 vo_macosx.m, 1.25, 1.26

[Nicolas Plourde CVS]

CVS change done by Nicolas Plourde CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv20903/libvo

Modified Files:
	vo_quartz.c vo_macosx.m 
Log Message:
fix various window resizing bug with menu option

Index: vo_quartz.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- vo_quartz.c	2 Jul 2005 19:44:48 -0000	1.52
+++ vo_quartz.c	3 Jul 2005 12:24:48 -0000	1.53
@@ -427,7 +427,10 @@
 				
 			case kAspectOrgCmd:
 				movie_aspect = old_movie_aspect;
-				SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect),1);
+				if(!vo_quartz_fs)
+				{
+					SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect),1);
+				}
 				window_resized();
 				break;
 				
@@ -452,6 +455,8 @@
 			case kPanScanCmd:
 				vo_panscan = (!(vo_panscan));
 				CheckMenuItem (aspectMenu, 2, vo_panscan);
+				window_panscan();
+				window_resized();
 				break;
 			
 			default:

Index: vo_macosx.m
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_macosx.m,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- vo_macosx.m	1 Jul 2005 17:24:31 -0000	1.25
+++ vo_macosx.m	3 Jul 2005 12:24:48 -0000	1.26
@@ -477,15 +477,25 @@
 			[kPanScanCmd setState:NSOnState];
 		else
 			[kPanScanCmd setState:NSOffState];
+			
+		[self panscan];
 	}
 	
 	if(sender == kAspectOrgCmd)
 	{
 		movie_aspect = old_movie_aspect;
-		frame.size.width = d_width*winSizeMult;
-		frame.size.height = (d_width/movie_aspect)*winSizeMult;
-		[window setContentSize: frame.size];
-		[self reshape];
+		
+		if(isFullscreen)
+		{
+			[self reshape];
+		}
+		else
+		{
+			frame.size.width = d_width*winSizeMult;
+			frame.size.height = (d_width/movie_aspect)*winSizeMult;
+			[window setContentSize: frame.size];
+			[self reshape];
+		}
 	}
 	
 	if(sender == kAspectFullCmd)
@@ -705,7 +715,7 @@
 	}
 	else
 	{	
-		SetSystemUIMode( kUIModeNormal, NULL);
+		SetSystemUIMode( kUIModeNormal, 0);
 		
 		isFullscreen = 0;
 		ShowCursor();