[murrine/dec09-new-features: 2/3] Fixed inactive GtkScale's border of the trough box with some colors

[Andrea Cimitan <acimitan src gnome org>]

commit 9fb2a6a01a73f85bec5a8486643c7c9f16dfc6b5
Author: Andrea Cimitan <andrea cimitan gmail com>
Date:   Fri Dec 4 12:14:35 2009 +0100

    Fixed inactive GtkScale's border of the trough box with some colors

 src/murrine_draw.c      |    3 +--
 src/murrine_draw_rgba.c |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/src/murrine_draw.c b/src/murrine_draw.c
index d3fbea6..615f9f6 100644
--- a/src/murrine_draw.c
+++ b/src/murrine_draw.c
@@ -155,7 +155,6 @@ murrine_draw_button (cairo_t *cr,
 	MurrineRGB fill = colors->bg[widget->state_type];
 	MurrineRGB border = colors->shade[!widget->disabled ? 6 : 5];
 	MurrineGradients mrn_gradient_custom = widget->mrn_gradient;
-;
 
 	if (widget->disabled)
 	{
@@ -485,7 +484,7 @@ murrine_draw_scale_trough (cairo_t *cr,
 	{
 		MurrineRGB fill, border;
 		murrine_shade (&colors->bg[widget->state_type], 1.0, &fill);
-		murrine_shade (&colors->bg[GTK_STATE_ACTIVE], get_contrast(0.82, widget->contrast), &border);
+		murrine_shade (&colors->bg[!widget->disabled ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE], get_contrast(0.82, widget->contrast), &border);
 
 		murrine_scale_draw_gradient (cr, &fill, &border,
 		                             1.0,
diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c
index b96a1f3..b0f9d36 100644
--- a/src/murrine_draw_rgba.c
+++ b/src/murrine_draw_rgba.c
@@ -398,7 +398,7 @@ murrine_rgba_draw_scale_trough (cairo_t *cr,
 	{
 		MurrineRGB fill, border;
 		murrine_shade (&colors->bg[widget->state_type], 1.0, &fill);
-		murrine_shade (&colors->bg[GTK_STATE_ACTIVE], get_contrast(0.82, widget->contrast), &border);
+		murrine_shade (&colors->bg[!widget->disabled ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE], get_contrast(0.82, widget->contrast), &border);
 
 		murrine_scale_draw_gradient (cr, &fill, &border,
 		                             1.0,