[murrine] Various fixes to the checkbox, radiobutton with border_shades

[Andrea Cimitan <acimitan src gnome org>]

commit 2255a551e98d1f823a71a34d4f6d18bbaff043ab
Author: Andrea Cimitan <andrea cimitan gmail com>
Date:   Wed Oct 28 22:01:01 2009 +0100

    Various fixes to the checkbox, radiobutton with border_shades

 src/murrine_draw.c      |    4 ++++
 src/murrine_draw_rgba.c |    4 ++++
 src/murrine_style.c     |   13 +++++++------
 3 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/src/murrine_draw.c b/src/murrine_draw.c
index a7e8c40..84a214d 100644
--- a/src/murrine_draw.c
+++ b/src/murrine_draw.c
@@ -1979,6 +1979,8 @@ murrine_draw_radiobutton (cairo_t *cr,
 		bg     = &colors->bg[0];
 
 		mrn_gradient_custom = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+		mrn_gradient_custom.border_shades[0] = get_decreased_shade (widget->mrn_gradient.border_shades[0], 3.0);
+		mrn_gradient_custom.border_shades[1] = get_decreased_shade (widget->mrn_gradient.border_shades[1], 3.0);
 		highlight_shade_custom = get_decreased_shade (widget->highlight_shade, 2.0);
 		lightborder_shade_custom = get_decreased_shade (widget->lightborder_shade, 2.0);
 	}
@@ -2100,6 +2102,8 @@ murrine_draw_checkbox (cairo_t *cr,
 		bg     = &colors->bg[0];
 
 		mrn_gradient_custom = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+		mrn_gradient_custom.border_shades[0] = get_decreased_shade (widget->mrn_gradient.border_shades[0], 3.0);
+		mrn_gradient_custom.border_shades[1] = get_decreased_shade (widget->mrn_gradient.border_shades[1], 3.0);
 		highlight_shade_custom = get_decreased_shade (widget->highlight_shade, 2.0);
 		lightborder_shade_custom = get_decreased_shade (widget->lightborder_shade, 2.0);
 	}
diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c
index ac74839..7b517a5 100644
--- a/src/murrine_draw_rgba.c
+++ b/src/murrine_draw_rgba.c
@@ -1502,6 +1502,8 @@ murrine_rgba_draw_radiobutton (cairo_t *cr,
 		bg     = &colors->bg[0];
 
 		mrn_gradient_custom = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+		mrn_gradient_custom.border_shades[0] = get_decreased_shade (widget->mrn_gradient.border_shades[0], 3.0);
+		mrn_gradient_custom.border_shades[1] = get_decreased_shade (widget->mrn_gradient.border_shades[1], 3.0);
 		highlight_shade_custom = get_decreased_shade (widget->highlight_shade, 2.0);
 		lightborder_shade_custom = get_decreased_shade (widget->lightborder_shade, 2.0);
 	}
@@ -1625,6 +1627,8 @@ murrine_rgba_draw_checkbox (cairo_t *cr,
 		bg     = &colors->bg[0];
 
 		mrn_gradient_custom = get_decreased_gradient_shades (widget->mrn_gradient, 3.0);
+		mrn_gradient_custom.border_shades[0] = get_decreased_shade (widget->mrn_gradient.border_shades[0], 3.0);
+		mrn_gradient_custom.border_shades[1] = get_decreased_shade (widget->mrn_gradient.border_shades[1], 3.0);
 		highlight_shade_custom = get_decreased_shade (widget->highlight_shade, 2.0);
 		lightborder_shade_custom = get_decreased_shade (widget->lightborder_shade, 2.0);
 	}
diff --git a/src/murrine_style.c b/src/murrine_style.c
index 8dbeed4..585166c 100644
--- a/src/murrine_style.c
+++ b/src/murrine_style.c
@@ -1433,12 +1433,13 @@ murrine_style_draw_option (DRAW_ARGS)
 	CheckboxParameters checkbox;
 
 	checkbox.shadow_type = shadow_type;
-	checkbox.in_menu = (widget && GTK_IS_MENU(widget->parent));
-
-	double trans = 1.0;
+	checkbox.in_cell = DETAIL ("cellradio");
+	checkbox.in_menu = (widget && widget->parent && GTK_IS_MENU(widget->parent));
 
 	murrine_set_widget_parameters (widget, style, state_type, &params);
 
+	double trans = 1.0;
+
 #ifdef HAVE_ANIMATION
 	if (murrine_style->animation)
 		murrine_animation_connect_checkbox (widget);
@@ -1474,13 +1475,13 @@ murrine_style_draw_check (DRAW_ARGS)
 	CheckboxParameters checkbox;
 
 	checkbox.shadow_type = shadow_type;
-	checkbox.in_cell = DETAIL("cellcheck");
-
+	checkbox.in_cell = DETAIL ("cellcheck");
 	checkbox.in_menu = (widget && widget->parent && GTK_IS_MENU(widget->parent));
-	double trans = 1.0;
 
 	murrine_set_widget_parameters (widget, style, state_type, &params);
 
+	double trans = 1.0;
+
 #ifdef HAVE_ANIMATION
 	if (murrine_style->animation)
 		murrine_animation_connect_checkbox (widget);