murrine r151 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Tue Mar 17 02:22:22 2009
New Revision: 151
URL: http://svn.gnome.org/viewvc/murrine?rev=151&view=rev

Log:
2009-03-17  Andrea Cimitan  <andrea cimitan gmail com>

	* src/murrine_style.c (murrine_style_draw_box):
	Changed params.active heuristic for toggle button, I should ask benzea 
	for more info.


Modified:
   trunk/ChangeLog
   trunk/src/murrine_style.c

Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c	(original)
+++ trunk/src/murrine_style.c	Tue Mar 17 02:22:22 2009
@@ -779,10 +779,12 @@
 		WidgetParameters params;
 
 		murrine_set_widget_parameters (widget, style, state_type, &params);
+		params.active = shadow_type == GTK_SHADOW_IN;
 		params.roundness = murrine_style->roundness;
 
 		boolean horizontal = TRUE;
-		if (((float)width/height<0.5)|| (murrine_style->glazestyle > 0 && width<height))
+		if (((float)width/height < 0.5) ||
+		    (murrine_style->glazestyle > 0 && width<height))
 			horizontal = FALSE;
 
 		if ((widget && (MRN_IS_COMBO_BOX_ENTRY (widget->parent) || MRN_IS_COMBO (widget->parent))))
@@ -811,6 +813,9 @@
 					x--;
 				width++;
 			}
+
+/*			if (murrine_style->reliefstyle > 1)*/
+/*				params.reliefstyle = 1;*/
 		}
 		else
 			if (murrine_style->roundness > 0)
@@ -818,10 +823,6 @@
 			else
 				params.corners = MRN_CORNER_NONE;
 
-		if (MRN_IS_TOGGLE_BUTTON (widget) &&
-		    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
-			params.active = TRUE;
-
 		STYLE_FUNCTION(draw_button) (cr, &murrine_style->colors, &params, x, y, width, height, horizontal);
 	}
 	else if (DETAIL ("spinbutton_up") || DETAIL ("spinbutton_down"))