[murrine] Refinements to the GtkScale, for insensitive scale

[Andrea Cimitan <acimitan src gnome org>]

commit b466679192b15bdc77e7117277a0c79f9a0c22ea
Author: Andrea Cimitan <andrea cimitan Å?mail com>
Date:   Tue Aug 17 23:55:34 2010 +0200

    Refinements to the GtkScale, for insensitive scale

 src/murrine_draw.c      |   11 ++++++++---
 src/murrine_draw_rgba.c |   11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/src/murrine_draw.c b/src/murrine_draw.c
index 1175cbb..d9612b3 100644
--- a/src/murrine_draw.c
+++ b/src/murrine_draw.c
@@ -587,8 +587,8 @@ murrine_draw_scale_trough (cairo_t *cr,
 	if (!slider->lower && !slider->fill_level)
 	{
 		MurrineRGB fill, border;
-		murrine_shade (&colors->bg[widget->state_type], 1.0, &fill);
-		murrine_shade (&colors->bg[!widget->disabled ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE], murrine_get_contrast(0.82, widget->contrast), &border);
+		murrine_shade (&colors->bg[GTK_STATE_ACTIVE], 1.0, &fill);
+		murrine_shade (&colors->bg[GTK_STATE_ACTIVE], murrine_get_contrast(0.82, widget->contrast), &border);
 
 		murrine_scale_draw_trough (cr, &fill, &border, widget->mrn_gradient,
 		                           widget->roundness, widget->corners,
@@ -597,7 +597,12 @@ murrine_draw_scale_trough (cairo_t *cr,
 	}
 	else
 	{
-		murrine_scale_draw_gradient (cr, &colors->spot[1], &colors->spot[2],
+		MurrineRGB fill, border;
+		murrine_shade (&colors->bg[GTK_STATE_SELECTED], 1.0, &fill);
+		murrine_mix_color (&fill, &widget->parentbg, widget->disabled ? 0.25 : 0.0, &fill);
+		murrine_shade (&fill, murrine_get_contrast(0.65, widget->contrast), &border);
+
+		murrine_scale_draw_gradient (cr, &fill, &border,
 		                             widget->disabled ? 1.0 : widget->lightborder_shade,
 		                             widget->lightborderstyle,
 		                             widget->roundness, widget->corners,
diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c
index d29c27a..ac961e3 100644
--- a/src/murrine_draw_rgba.c
+++ b/src/murrine_draw_rgba.c
@@ -425,8 +425,8 @@ murrine_rgba_draw_scale_trough (cairo_t *cr,
 	if (!slider->lower && !slider->fill_level)
 	{
 		MurrineRGB fill, border;
-		murrine_shade (&colors->bg[widget->state_type], 1.0, &fill);
-		murrine_shade (&colors->bg[!widget->disabled ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE], murrine_get_contrast(0.82, widget->contrast), &border);
+		murrine_shade (&colors->bg[GTK_STATE_ACTIVE], 1.0, &fill);
+		murrine_shade (&colors->bg[GTK_STATE_ACTIVE], murrine_get_contrast(0.82, widget->contrast), &border);
 
 		murrine_scale_draw_trough (cr, &fill, &border, widget->mrn_gradient,
 		                           widget->roundness, widget->corners,
@@ -435,7 +435,12 @@ murrine_rgba_draw_scale_trough (cairo_t *cr,
 	}
 	else
 	{
-		murrine_scale_draw_gradient (cr, &colors->spot[1], &colors->spot[2],
+		MurrineRGB fill, border;
+		murrine_shade (&colors->bg[GTK_STATE_SELECTED], 1.0, &fill);
+		murrine_mix_color (&fill, &widget->parentbg, widget->disabled ? 0.25 : 0.0, &fill);
+		murrine_shade (&fill, murrine_get_contrast(0.65, widget->contrast), &border);
+
+		murrine_scale_draw_gradient (cr, &fill, &border,
 		                             widget->disabled ? 1.0 : widget->lightborder_shade,
 		                             widget->lightborderstyle,
 		                             widget->roundness, widget->corners,