murrine r122 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Sun Jan  4 03:24:46 2009
New Revision: 122
URL: http://svn.gnome.org/viewvc/murrine?rev=122&view=rev

Log:
2009-01-04  Andrea Cimitan  <andrea cimitan gmail com>

	* src/murrine_draw.c (murrine_draw_radiobutton),
	(murrine_draw_checkbox):
	* src/murrine_draw_rgba.c (murrine_rgba_draw_radiobutton),
	(murrine_rgba_draw_checkbox):
	Changed inactive disabled checkbutton/radiobutton:
	no background is drawn.


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	Sun Jan  4 03:24:46 2009
@@ -1877,14 +1877,23 @@
 		else
 			murrine_draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, roundness+1, widget->corners);
 	}
+
 	cairo_save (cr);
 
 	murrine_rounded_rectangle_closed (cr, 1.5, 1.5, width-3, height-3, roundness, widget->corners);
 	cairo_clip_preserve (cr);
-	murrine_draw_glaze (cr, bg,
-	                    widget->glow_shade, highlight_shade_custom, widget->lightborder_shade,
-	                    mrn_gradient_custom, widget, 2, 2, width-4, height-4,
-	                    roundness, widget->corners, TRUE);
+	if (draw_bullet)
+	{
+		murrine_draw_glaze (cr, bg,
+		                    widget->glow_shade, highlight_shade_custom, widget->lightborder_shade,
+		                    mrn_gradient_custom, widget, 2, 2, width-4, height-4,
+		                    roundness, widget->corners, TRUE);
+	}
+	else
+	{
+		murrine_set_color_rgb (cr, bg);
+		cairo_fill (cr);
+	}
 
 	cairo_restore (cr);
 
@@ -1913,8 +1922,6 @@
 			cairo_fill (cr);
 		}
 	}
-
-	cairo_restore (cr);
 }
 
 static void
@@ -1976,12 +1983,24 @@
 			murrine_draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, roundness+1, widget->corners);
 	}
 
+	cairo_save (cr);
+
 	murrine_rounded_rectangle_closed (cr, 1.5, 1.5, width-3, height-3, roundness, widget->corners);
+	cairo_clip_preserve (cr);
+	if (draw_bullet)
+	{
+		murrine_draw_glaze (cr, bg,
+		                    widget->glow_shade, highlight_shade_custom, widget->lightborder_shade,
+		                    mrn_gradient_custom, widget, 2, 2, width-4, height-4,
+		                    roundness, widget->corners, TRUE);
+	}
+	else
+	{
+		murrine_set_color_rgb (cr, bg);
+		cairo_fill (cr);
+	}
 
-	murrine_draw_glaze (cr, bg,
-	                    widget->glow_shade, highlight_shade_custom, widget->lightborder_shade,
-	                    mrn_gradient_custom, widget, 2, 2, width-4, height-4,
-	                    roundness, widget->corners, TRUE);
+	cairo_restore (cr);
 
 	murrine_rounded_rectangle_closed (cr, 1.5, 1.5, width-3, height-3, roundness, widget->corners);
 	murrine_set_color_rgb (cr, border);

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Sun Jan  4 03:24:46 2009
@@ -1484,14 +1484,23 @@
 		else
 			murrine_draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, roundness+1, widget->corners);
 	}
+
 	cairo_save (cr);
 
 	murrine_rounded_rectangle_closed (cr, 1.5, 1.5, width-3, height-3, roundness, widget->corners);
 	cairo_clip_preserve (cr);
-	murrine_draw_glaze (cr, bg,
-	                    widget->glow_shade, highlight_shade_custom, widget->lightborder_shade,
-	                    mrn_gradient_custom, widget, 2, 2, width-4, height-4,
-	                    roundness, widget->corners, TRUE);
+	if (draw_bullet)
+	{
+		murrine_draw_glaze (cr, bg,
+		                    widget->glow_shade, highlight_shade_custom, widget->lightborder_shade,
+		                    mrn_gradient_custom, widget, 2, 2, width-4, height-4,
+		                    roundness, widget->corners, TRUE);
+	}
+	else
+	{
+		murrine_set_color_rgb (cr, bg);
+		cairo_fill (cr);
+	}
 
 	cairo_restore (cr);
 
@@ -1520,8 +1529,6 @@
 			cairo_fill (cr);
 		}
 	}
-
-	cairo_restore (cr);
 }
 
 static void
@@ -1584,14 +1591,23 @@
 		else
 			murrine_draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, roundness+1, widget->corners);
 	}
+
 	cairo_save (cr);
 
 	murrine_rounded_rectangle_closed (cr, 1.5, 1.5, width-3, height-3, roundness, widget->corners);
 	cairo_clip_preserve (cr);
-	murrine_draw_glaze (cr, bg,
-	                    widget->glow_shade, highlight_shade_custom, widget->lightborder_shade,
-	                    mrn_gradient_custom, widget, 2, 2, width-4, height-4,
-	                    roundness, widget->corners, TRUE);
+	if (draw_bullet)
+	{
+		murrine_draw_glaze (cr, bg,
+		                    widget->glow_shade, highlight_shade_custom, widget->lightborder_shade,
+		                    mrn_gradient_custom, widget, 2, 2, width-4, height-4,
+		                    roundness, widget->corners, TRUE);
+	}
+	else
+	{
+		murrine_set_color_rgb (cr, bg);
+		cairo_fill (cr);
+	}
 
 	cairo_restore (cr);