murrine r69 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Fri Sep 26 20:47:32 2008
New Revision: 69
URL: http://svn.gnome.org/viewvc/murrine?rev=69&view=rev

Log:
2008-09-26  Andrea Cimitan  <andrea cimitan gmail com>

	* src/murrine_draw.c (murrine_draw_highlight_and_shade),
	(murrine_draw_frame):
	* src/murrine_draw_rgba.c (murrine_draw_highlight_and_shade),
	(murrine_rgba_draw_frame):
	Fixes bugs with rounded shadows


Modified:
   trunk/ChangeLog
   trunk/src/murrine_draw.c
   trunk/src/murrine_draw_rgba.c

Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c	(original)
+++ trunk/src/murrine_draw.c	Fri Sep 26 20:47:32 2008
@@ -94,6 +94,9 @@
 	double x = 1.0;
 	double y = 1.0;
 
+	if (radius < 0)
+		radius = 0;
+
 	murrine_shade (&colors->bg[0], 1.04, &highlight);
 	murrine_shade (&colors->bg[0], 0.96, &shadow);
 
@@ -910,7 +913,7 @@
 		ShadowParameters shadow;
 		shadow.corners = widget->corners;
 		shadow.shadow  = frame->shadow;
-		murrine_draw_highlight_and_shade (cr, colors, &shadow, width, height, 0);
+		murrine_draw_highlight_and_shade (cr, colors, &shadow, width, height, widget->roundness-1);
 	}
 
 	/* restore the previous clip region */

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Fri Sep 26 20:47:32 2008
@@ -95,6 +95,9 @@
 	murrine_shade (&colors->bg[0], 1.15, &highlight);
 	murrine_shade (&colors->bg[0], 0.4, &shadow);
 
+	if (radius < 0)
+		radius = 0;
+
 	width  -= 3;
 	height -= 3;
 
@@ -973,7 +976,7 @@
 		ShadowParameters shadow;
 		shadow.corners = widget->corners;
 		shadow.shadow  = frame->shadow;
-		murrine_draw_highlight_and_shade (cr, colors, &shadow, width, height, 0);
+		murrine_draw_highlight_and_shade (cr, colors, &shadow, width, height, widget->roundness-1);
 	}
 
 	/* restore the previous clip region */