murrine r127 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Mon Jan  5 17:21:29 2009
New Revision: 127
URL: http://svn.gnome.org/viewvc/murrine?rev=127&view=rev

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

	* src/murrine_draw.c (murrine_draw_progressbar_fill):
	* src/murrine_draw_rgba.c (murrine_rgba_draw_progressbar_fill):
	Fixed rounded progressbars's corners.


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	Mon Jan  5 17:21:29 2009
@@ -545,16 +545,15 @@
 
 	cairo_save (cr);
 
-	murrine_rounded_rectangle_closed (cr, 1, 0, width-2+roundness, height,
+	murrine_rounded_rectangle_closed (cr, 2, 1, width-4+roundness, height-2,
 	                                  roundness, MRN_CORNER_TOPLEFT | MRN_CORNER_BOTTOMLEFT);
 	cairo_clip (cr);
-	murrine_rounded_rectangle_closed (cr, 1-roundness, 0, width-2+roundness, height,
+	murrine_rounded_rectangle_closed (cr, 2-roundness, 1, width-4+roundness, height-2,
 	                                  roundness, MRN_CORNER_TOPRIGHT | MRN_CORNER_BOTTOMRIGHT);
 	cairo_clip (cr);
 
 	cairo_rectangle (cr, 2, 1, width-4, height-2);
 
-	cairo_save (cr);
 	murrine_draw_glaze (cr, fill,
 	                    widget->glow_shade, widget->highlight_shade, widget->lightborder_shade,
 	                    widget->mrn_gradient, widget, 2, 1, width-4, height-2,
@@ -609,6 +608,15 @@
 
 	cairo_restore (cr);
 
+	cairo_save (cr);
+
+	murrine_rounded_rectangle_closed (cr, 1, 0, width-2+roundness, height,
+	                                  roundness, MRN_CORNER_TOPLEFT | MRN_CORNER_BOTTOMLEFT);
+	cairo_clip (cr);
+	murrine_rounded_rectangle_closed (cr, 1-roundness, 0, width-2+roundness, height,
+	                                  roundness, MRN_CORNER_TOPRIGHT | MRN_CORNER_BOTTOMRIGHT);
+	cairo_clip (cr);
+
 	/* Draw the border */
 	murrine_mix_color (&border, fill, 0.28, &border);
 	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	Mon Jan  5 17:21:29 2009
@@ -500,10 +500,10 @@
 	cairo_save (cr);
 	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
-	murrine_rounded_rectangle_closed (cr, 1, 0, width-2+roundness, height,
+	murrine_rounded_rectangle_closed (cr, 2, 1, width-4+roundness, height-2,
 	                                  roundness, MRN_CORNER_TOPLEFT | MRN_CORNER_BOTTOMLEFT);
 	cairo_clip (cr);
-	murrine_rounded_rectangle_closed (cr, 1-roundness, 0, width-2+roundness, height,
+	murrine_rounded_rectangle_closed (cr, 2-roundness, 1, width-4+roundness, height-2,
 	                                  roundness, MRN_CORNER_TOPRIGHT | MRN_CORNER_BOTTOMRIGHT);
 	cairo_clip (cr);
 
@@ -565,6 +565,15 @@
 
 	cairo_restore (cr);
 
+	cairo_save (cr);
+
+	murrine_rounded_rectangle_closed (cr, 1, 0, width-2+roundness, height,
+	                                  roundness, MRN_CORNER_TOPLEFT | MRN_CORNER_BOTTOMLEFT);
+	cairo_clip (cr);
+	murrine_rounded_rectangle_closed (cr, 1-roundness, 0, width-2+roundness, height,
+	                                  roundness, MRN_CORNER_TOPRIGHT | MRN_CORNER_BOTTOMRIGHT);
+	cairo_clip (cr);
+
 	/* Draw the border */
 	murrine_mix_color (&border, fill, 0.28, &border);
 	murrine_set_color_rgb (cr, &border);