murrine r109 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Fri Jan  2 04:55:10 2009
New Revision: 109
URL: http://svn.gnome.org/viewvc/murrine?rev=109&view=rev

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

	* src/murrine_draw.c (murrine_draw_button),
	(murrine_draw_menuitem), (murrine_draw_scrollbar_stepper):
	* src/murrine_draw_rgba.c (murrine_rgba_draw_button),
	(murrine_rgba_draw_scrollbar_stepper):
	Always clip with roundness = 0 or 1.
	This could be slower with roundness = 0 or 1:
	please TEST and tell me if there is a performance regression.



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 Jan  2 04:55:10 2009
@@ -191,8 +191,7 @@
 	murrine_rounded_rectangle_closed (cr, xos+1, yos+1, width-(xos*2)-2, height-(yos*2)-2, widget->roundness-1, widget->corners);
 
 	cairo_save (cr);
-	if (widget->roundness > 1)
-		cairo_clip_preserve (cr);
+	cairo_clip_preserve (cr);
 
 	murrine_draw_glaze (cr, &fill,
 	                    widget->glow_shade, highlight_shade_custom, !widget->active ? widget->lightborder_shade : 1.0,
@@ -1227,8 +1226,7 @@
 	{
 		default:
 		case 1:
-			if (widget->roundness > 1)
-				cairo_clip_preserve (cr);
+			cairo_clip_preserve (cr);
 
 			murrine_draw_glaze (cr, &colors->spot[1],
 			                    widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
@@ -1337,8 +1335,7 @@
 	murrine_rounded_rectangle_closed (cr, 1, 1, width-2, height-2, widget->roundness-1, widget->corners);
 
 	cairo_save (cr);
-	if (widget->roundness > 1)
-		cairo_clip_preserve(cr);
+	cairo_clip_preserve(cr);
 
 	murrine_draw_glaze (cr, fill,
 	                    widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Fri Jan  2 04:55:10 2009
@@ -192,8 +192,7 @@
 	cairo_save (cr);
 	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
-	if (widget->roundness > 1)
-		cairo_clip_preserve (cr);
+	cairo_clip_preserve (cr);
 
 	murrine_draw_glaze (cr, &fill,
 	                    widget->glow_shade, highlight_shade_custom, !widget->active ? widget->lightborder_shade : 1.0,
@@ -1132,8 +1131,7 @@
 	murrine_rounded_rectangle_closed (cr, 1, 1, width-2, height-2, widget->roundness-1, widget->corners);
 
 	cairo_save (cr);
-	if (widget->roundness > 1)
-		cairo_clip_preserve(cr);
+	cairo_clip_preserve(cr);
 
 	murrine_draw_glaze (cr, fill,
 	                    widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,