murrine r105 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Sun Dec 28 20:47:00 2008
New Revision: 105
URL: http://svn.gnome.org/viewvc/murrine?rev=105&view=rev

Log:
2008-12-28  Andrea Cimitan  <andrea cimitan gmail com>

	* src/cairo-support.c (murrine_draw_glaze):
	Fixed a bug in RGBA mode.


Modified:
   trunk/ChangeLog
   trunk/src/cairo-support.c

Modified: trunk/src/cairo-support.c
==============================================================================
--- trunk/src/cairo-support.c	(original)
+++ trunk/src/cairo-support.c	Sun Dec 28 20:47:00 2008
@@ -708,12 +708,24 @@
 	}
 	murrine_set_gradient (cr, &highlight, mrn_gradient, x, y, 0, height, mrn_gradient.gradients, TRUE);
 	cairo_fill (cr);
+	if (widget->glazestyle == 4)
+	{
+		MurrineRGB shadow;
+		murrine_shade (fill, 1.0/highlight_ratio, &shadow);
 
+		murrine_draw_curved_highlight_bottom (cr, x, y, width, height);
+		murrine_set_gradient (cr, &shadow, mrn_gradient, x, y, 0, height, mrn_gradient.gradients, TRUE);
+		cairo_fill (cr);
+	}
+	
 	if (glow_ratio != 1.0)
 	{
 		MurrineRGB glow;
 		murrine_shade (fill, glow_ratio, &glow);
 
+		if (mrn_gradient.use_rgba)
+			cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+
 		switch (widget->glowstyle)
 		{
 			default:
@@ -736,16 +748,7 @@
 		}
 	}
 
-	if (widget->glazestyle == 4)
-	{
-		MurrineRGB shadow;
-		murrine_shade (fill, 1.0/highlight_ratio, &shadow);
-
-		murrine_draw_curved_highlight_bottom (cr, x, y, width, height);
-		murrine_set_gradient (cr, &shadow, mrn_gradient, x, y, 0, height, mrn_gradient.gradients, TRUE);
-		cairo_fill (cr);
-	}
-	else if (lightborder_ratio != 1.0)
+	if (widget->glazestyle != 4 && lightborder_ratio != 1.0)
 	{
 		murrine_shade (fill, lightborder_ratio*highlight_ratio, &highlight);