murrine r21 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Wed Feb 27 13:14:57 2008
New Revision: 21
URL: http://svn.gnome.org/viewvc/murrine?rev=21&view=rev

Log:
2008-02-27  Andrea Cimitan  <andrea cimitan gmail com>

	* src/murrine_draw.c: (murrine_draw_button):
	* src/murrine_draw_rgba.c: (murrine_rgba_draw_button):
	* src/murrine_style.c: (murrine_style_init_from_rc),
	(murrine_style_realize):
	Fixed contrast and inset on RGBA active buttons


Modified:
   trunk/ChangeLog
   trunk/src/murrine_draw.c
   trunk/src/murrine_draw_rgba.c
   trunk/src/murrine_style.c

Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c	(original)
+++ trunk/src/murrine_draw.c	Wed Feb 27 13:14:57 2008
@@ -191,7 +191,9 @@
 		cairo_stroke (cr);
 	}
 	else if (widget->reliefstyle != 0)
-		murrine_draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, widget->roundness+1, widget->corners);
+		murrine_draw_inset (cr, &widget->parentbg, xoffset-0.5, yoffset-0.5,
+		                    width-(xoffset*2)+1, height-(yoffset*2)+1,
+		                    widget->roundness+1, widget->corners);
 
 	murrine_mix_color (widget->disabled ? &border_disabled : &border_normal , &fill, 0.4,
 	                   widget->disabled ? &border_disabled : &border_normal);

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Wed Feb 27 13:14:57 2008
@@ -188,7 +188,9 @@
 		cairo_stroke (cr);
 	}
 	else if (widget->reliefstyle != 0)
-		murrine_draw_inset (cr, &widget->parentbg, 0.5, 0.5, width-1, height-1, widget->roundness+1, widget->corners);
+		murrine_draw_inset (cr, &widget->parentbg, xoffset-0.5, yoffset-0.5,
+		                    width-(xoffset*2)+1, height-(yoffset*2)+1,
+		                    widget->roundness+1, widget->corners);
 
 	murrine_mix_color (widget->disabled ? &border_disabled : &border_normal , &widget->parentbg, 0.2,
 	                   widget->disabled ? &border_disabled : &border_normal);
@@ -315,8 +317,6 @@
 		cairo_pattern_destroy (pattern);
 
 		cairo_restore (cr);
-
-		murrine_draw_inset (cr, &widget->parentbg, xoffset-0.5, yoffset-0.5, width-(xoffset*2)+1, height-(yoffset*2)+1, widget->roundness+1, widget->corners);
 	}
 
 	/* Draw the border */

Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c	(original)
+++ trunk/src/murrine_style.c	Wed Feb 27 13:14:57 2008
@@ -1607,7 +1607,6 @@
 
 	murrine_parent_class->init_from_rc (style, rc_style);
 
-	murrine_style->contrast           = MURRINE_RC_STYLE (rc_style)->contrast;
 	murrine_style->gradient_stop_1    = MURRINE_RC_STYLE (rc_style)->gradient_stop_1;
 	murrine_style->gradient_stop_2    = MURRINE_RC_STYLE (rc_style)->gradient_stop_2;
 	murrine_style->gradient_stop_3    = MURRINE_RC_STYLE (rc_style)->gradient_stop_3;
@@ -1727,7 +1726,7 @@
 
 	murrine_parent_class->realize (style);
 
-	contrast = murrine_style->contrast;
+	contrast = MURRINE_RC_STYLE (style->rc_style)->contrast;
 
 	bg_normal.r = style->bg[0].red   / 65535.0;
 	bg_normal.g = style->bg[0].green / 65535.0;