[murrine] Better handling of the disabled state

[Andrea Cimitan <acimitan src gnome org>]

commit 2aa2ff8fb2bf82439318cab24fc270a4eb09bcce
Author: Andrea Cimitan <andrea cimitan Å?mail com>
Date:   Wed Aug 18 11:49:58 2010 +0200

    Better handling of the disabled state

 src/murrine_draw.c      |    8 +++++---
 src/murrine_draw_rgba.c |    8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/src/murrine_draw.c b/src/murrine_draw.c
index 2f66792..25e5c7d 100644
--- a/src/murrine_draw.c
+++ b/src/murrine_draw.c
@@ -154,7 +154,7 @@ murrine_draw_button (cairo_t *cr,
 	double highlight_shade_new = widget->highlight_shade;
 	double lightborder_shade_new = widget->lightborder_shade;
 	MurrineGradients mrn_gradient_new = widget->mrn_gradient;
-	MurrineRGB border = colors->shade[!widget->disabled ? 6 : 4];
+	MurrineRGB border;
 	MurrineRGB fill = colors->bg[widget->state_type];
 /*
 	if (widget->active)
@@ -173,6 +173,7 @@ murrine_draw_button (cairo_t *cr,
 		glow_shade_new = murrine_get_decreased_shade (widget->glow_shade, 2.0);
 		highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
 		lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
+		murrine_shade (&fill, murrine_get_contrast(0.75, widget->contrast), &border);
 	}
 	else
 		murrine_shade (&fill, murrine_get_contrast(0.475, widget->contrast), &border);
@@ -639,7 +640,7 @@ murrine_draw_slider (cairo_t *cr,
 	double highlight_shade_new = widget->highlight_shade;
 	double lightborder_shade_new = widget->lightborder_shade;
 	MurrineGradients mrn_gradient_new = widget->mrn_gradient;
-	MurrineRGB border = colors->shade[!widget->disabled ? 6 : 5];
+	MurrineRGB border;
 	MurrineRGB fill = colors->bg[widget->state_type];
 
 	murrine_get_fill_color (&fill, &mrn_gradient_new);
@@ -652,9 +653,10 @@ murrine_draw_slider (cairo_t *cr,
 		glow_shade_new = murrine_get_decreased_shade (widget->glow_shade, 2.0);
 		highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
 		lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
+		murrine_shade (&fill, murrine_get_contrast(0.75, widget->contrast), &border);
 	}
 	else
-		murrine_shade (&colors->shade[6], 0.95, &border);
+		murrine_shade (&fill, murrine_get_contrast(0.475, widget->contrast), &border);
 
 	if (!slider->horizontal)
 		murrine_exchange_axis (cr, &x, &y, &width, &height);
diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c
index 8e149b1..53d8b9b 100644
--- a/src/murrine_draw_rgba.c
+++ b/src/murrine_draw_rgba.c
@@ -154,7 +154,7 @@ murrine_rgba_draw_button (cairo_t *cr,
 	double highlight_shade_new = widget->highlight_shade;
 	double lightborder_shade_new = widget->lightborder_shade;
 	MurrineGradients mrn_gradient_new = widget->mrn_gradient;
-	MurrineRGB border = colors->shade[!widget->disabled ? 8 : 6];
+	MurrineRGB border;
 	MurrineRGB fill = colors->bg[widget->state_type];
 
 	murrine_get_fill_color (&fill, &mrn_gradient_new);
@@ -167,6 +167,7 @@ murrine_rgba_draw_button (cairo_t *cr,
 		glow_shade_new = murrine_get_decreased_shade (widget->glow_shade, 2.0);
 		highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
 		lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
+		murrine_shade (&fill, murrine_get_contrast(0.5, widget->contrast), &border);
 	}
 	else
 		murrine_shade (&fill, murrine_get_contrast(0.38, widget->contrast), &border);
@@ -477,7 +478,7 @@ murrine_rgba_draw_slider (cairo_t *cr,
 	double highlight_shade_new = widget->highlight_shade;
 	double lightborder_shade_new = widget->lightborder_shade;
 	MurrineGradients mrn_gradient_new = widget->mrn_gradient;
-	MurrineRGB border = colors->shade[!widget->disabled ? 8 : 6];
+	MurrineRGB border;
 	MurrineRGB fill = colors->bg[widget->state_type];
 
 	murrine_get_fill_color (&fill, &mrn_gradient_new);
@@ -490,9 +491,10 @@ murrine_rgba_draw_slider (cairo_t *cr,
 		glow_shade_new = murrine_get_decreased_shade (widget->glow_shade, 2.0);
 		highlight_shade_new = murrine_get_decreased_shade (widget->highlight_shade, 2.0);
 		lightborder_shade_new = murrine_get_decreased_shade (widget->lightborder_shade, 2.0);
+		murrine_shade (&fill, murrine_get_contrast(0.5, widget->contrast), &border);
 	}
 	else
-		murrine_shade (&colors->shade[6], 0.95, &border);
+		murrine_shade (&fill, murrine_get_contrast(0.38, widget->contrast), &border);
 
 	if (!slider->horizontal)
 		murrine_exchange_axis (cr, &x, &y, &width, &height);