[Mplayer-cvslog] CVS: main/libvo vo_quartz.c,1.40,1.41

[Nicolas Plourde CVS]

CVS change done by Nicolas Plourde CVS

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

Modified Files:
	vo_quartz.c 
Log Message:
set aqua default theme

Index: vo_quartz.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- vo_quartz.c	1 Nov 2004 17:19:25 -0000	1.40
+++ vo_quartz.c	2 Nov 2004 18:16:41 -0000	1.41
@@ -117,7 +117,7 @@
 static MenuRef movMenu;
 static MenuRef aspectMenu;
 
-static int border = 20;
+static int border = 15;
 enum
 {
 	kQuitCmd			= 1,
@@ -605,7 +605,6 @@
 	//Create player window//////////////////////////////////////////////////
 	windowAttrs =   kWindowStandardDocumentAttributes
 					| kWindowStandardHandlerAttribute
-					| kWindowMetalAttribute
 					| kWindowCompositingAttribute
 					| kWindowLiveResizeAttribute;
 					
@@ -629,6 +628,7 @@
  	}
 	
 	//Show window
+	SetThemeWindowBackground( theWindow, kThemeBrushModelessDialogBackgroundActive, TRUE);
 	RepositionWindow(theWindow, NULL, kWindowCenterOnMainScreen);
 	ShowWindow (theWindow);
 	
@@ -1146,12 +1146,11 @@
 	float aspectX;
 	float aspectY;
 	
-	int padding;
+	int padding = 0;
 	
 	uint32_t d_width;
 	uint32_t d_height;
 	
-	Rect tmpRect;
 	CGRect tmpBounds;
 
 	GetPortBounds( GetWindowPort(theWindow), &winRect );
@@ -1181,6 +1180,7 @@
 	}
 
 	//Clear Background
+	SetThemeWindowBackground( theWindow, kThemeBrushUtilityWindowBackgroundInactive, TRUE);
 	tmpBounds = CGRectMake( 0, border, winRect.right, winRect.bottom);
 	CreateCGContextForPort(GetWindowPort(theWindow),&context);
 	CGContextClearRect(context, tmpBounds);
@@ -1289,7 +1289,7 @@
 		//go fullscreen
 		border = 0;
 		panscan_calc();
-		ChangeWindowAttributes(theWindow, 0, kWindowResizableAttribute);
+		ChangeWindowAttributes(theWindow, 0, kWindowResizableAttribute|kWindowNoShadowAttribute);
 		MoveWindow(theWindow, deviceRect.left-(vo_panscan_x >> 1), deviceRect.top-(vo_panscan_y >> 1), 1);
 		SizeWindow(theWindow, device_width+vo_panscan_x, device_height+vo_panscan_y,1);
 
@@ -1314,8 +1314,8 @@
 		ShowCursor();
 		
 		//revert window to previous setting
-		border = 20;
-		ChangeWindowAttributes(theWindow, kWindowResizableAttribute, 0);
+		border = 15;
+		ChangeWindowAttributes(theWindow, kWindowResizableAttribute, kWindowNoShadowAttribute);
 		SizeWindow(theWindow, oldWinRect.right, oldWinRect.bottom,1);
 		MoveWindow(theWindow, oldWinBounds.left, oldWinBounds.top, 1);