Mercurial > mplayer.hg

changeset 15902:16534910f0fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix various window resizing bug with menu option
author nplourde
date Sun, 03 Jul 2005 12:24:48 +0000
parents 7938b1ee8986
children a276ca0f64e2
files libvo/vo_macosx.m libvo/vo_quartz.c
diffstat 2 files changed, 21 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_macosx.m	Sun Jul 03 12:13:48 2005 +0000
+++ b/libvo/vo_macosx.m	Sun Jul 03 12:24:48 2005 +0000
@@ -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();
--- a/libvo/vo_quartz.c	Sun Jul 03 12:13:48 2005 +0000
+++ b/libvo/vo_quartz.c	Sun Jul 03 12:24:48 2005 +0000
@@ -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: