[murrine] better handling of the contrast function on buttons, minor refinement to the task list

[Andrea Cimitan <acimitan src gnome org>]

commit 31a36fc8a2d04b3bbe5e37abbd8633fe2ced0fb8
Author: Andrea Cimitan <andrea cimitan Å?mail com>
Date:   Tue Aug 17 14:57:51 2010 +0200

    better handling of the contrast function on buttons, minor refinement to the task list

 src/murrine_draw.c      |    4 ++--
 src/murrine_draw_rgba.c |    4 ++--
 src/murrine_style.c     |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/murrine_draw.c b/src/murrine_draw.c
index 6f5da94..1175cbb 100644
--- a/src/murrine_draw.c
+++ b/src/murrine_draw.c
@@ -175,12 +175,12 @@ murrine_draw_button (cairo_t *cr,
 		lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
 	}
 	else
-		murrine_shade (&colors->shade[6], 0.95, &border);
+		murrine_shade (&fill, murrine_get_contrast(0.475, widget->contrast), &border);
 
 	/* Default button */
 	if (widget->is_default && !widget->disabled)
 	{
-		murrine_shade (&border, 0.8, &border);
+		murrine_shade (&border, murrine_get_contrast(0.8, widget->contrast), &border);
 		murrine_mix_color (&fill, &colors->spot[1], 0.2, &fill);
 
 		if (button->has_default_button_color)
diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c
index b65025c..d29c27a 100644
--- a/src/murrine_draw_rgba.c
+++ b/src/murrine_draw_rgba.c
@@ -169,12 +169,12 @@ murrine_rgba_draw_button (cairo_t *cr,
 		lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
 	}
 	else
-		murrine_shade (&colors->shade[8], 0.95, &border);
+		murrine_shade (&fill, murrine_get_contrast(0.38, widget->contrast), &border);
 
 	/* Default button */
 	if (widget->is_default)
 	{
-		murrine_shade (&border, 0.8, &border);
+		murrine_shade (&border, murrine_get_contrast(0.8, widget->contrast), &border);
 		murrine_mix_color (&fill, &colors->spot[1], 0.2, &fill);
 
 		if (button->has_default_button_color)
diff --git a/src/murrine_style.c b/src/murrine_style.c
index 69a0b05..b756095 100644
--- a/src/murrine_style.c
+++ b/src/murrine_style.c
@@ -935,7 +935,7 @@ murrine_style_draw_box (DRAW_ARGS)
 			if (params.xthickness == 0 && params.ythickness == 0)
 			{
 				x--; width+=1;
-				y--; height+=2;
+				y-=2; height+=4;
 				params.roundness = 0;
 			}		
 		}