murrine r141 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Sun Feb 22 01:25:11 2009
New Revision: 141
URL: http://svn.gnome.org/viewvc/murrine?rev=141&view=rev

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

	* src/murrine_draw.c (murrine_draw_checkbox),
	(murrine_draw_classic_focus), (murrine_draw_focus):
	* src/murrine_draw_rgba.c (murrine_rgba_draw_checkbox),
	(murrine_rgba_draw_menu_frame):
	Small change in rgba rounded menus, updated previous
	ChangeLog entry.


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 Feb 22 01:25:11 2009
@@ -2015,7 +2015,7 @@
 
 	if (draw_bullet)
 	{
-		if (inconsistent) /* Inconsistent */
+		if (inconsistent)
 		{
 			cairo_save (cr);
 			cairo_set_line_width (cr, 2.0);
@@ -2074,6 +2074,8 @@
                             const FocusParameters  *focus,
                             int x, int y, int width, int height)
 {
+	cairo_set_line_width (cr, focus->line_width);
+
 	if (focus->has_color)
 		murrine_set_color_rgb (cr, &focus->color);
 	else if (focus->type == MRN_FOCUS_COLOR_WHEEL_LIGHT)
@@ -2083,8 +2085,6 @@
 	else
 		murrine_set_color_rgba (cr, &colors->fg[widget->state_type], 0.7);
 
-	cairo_set_line_width (cr, focus->line_width);
-
 	if (focus->dash_list[0])
 	{
 		gint n_dashes = strlen ((gchar *)focus->dash_list);
@@ -2119,8 +2119,8 @@
                     const FocusParameters  *focus,
                     int x, int y, int width, int height)
 {
-	MurrineRGB fill = focus->color;
 	MurrineRGB border;
+	MurrineRGB fill = focus->color;
 
 	/* Default values */
 	int radius = 0;
@@ -2203,7 +2203,7 @@
 	{
 		cairo_new_path (cr);
 		cairo_move_to (cr, xoffset, height-yoffset-0.5);
-		cairo_line_to (cr, width-xoffset,  height-yoffset-0.5);
+		cairo_line_to (cr, width-xoffset, height-yoffset-0.5);
 		murrine_set_color_rgba (cr, &border, border_alpha);
 		cairo_stroke (cr);
 	}

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Sun Feb 22 01:25:11 2009
@@ -1628,7 +1628,7 @@
 
 	if (draw_bullet)
 	{
-		if (inconsistent) /* Inconsistent */
+		if (inconsistent)
 		{
 			cairo_save (cr);
 			cairo_set_line_width (cr, 2.0);
@@ -1659,8 +1659,7 @@
                               int menustyle)
 {
 	const MurrineRGB *border = &colors->shade[5];
-	uint8 corners = (menustyle == 1 ? MRN_CORNER_TOPRIGHT | MRN_CORNER_BOTTOMRIGHT :
-	                                  MRN_CORNER_TOPRIGHT |
+	uint8 corners = (menustyle == 1 ? MRN_CORNER_BOTTOMRIGHT :
 	                                  MRN_CORNER_BOTTOMLEFT | MRN_CORNER_BOTTOMRIGHT);
 
 	cairo_translate      (cr, x, y);