gtk-engines r1028 - in trunk: . engines/clearlooks/src

[acimitan svn gnome org]

Author: acimitan
Date: Wed Jan 23 22:41:37 2008
New Revision: 1028
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1028&view=rev

Log:
2008-01-23  Andrea Cimitan  <andrea cimitan gmail com>

	* engines/clearlooks/src/clearlooks_rc_style.c:
	(clearlooks_rc_style_init):
	* engines/clearlooks/src/clearlooks_style.c:
	(clearlooks_style_init_from_rc):
	Better approach to reliefstyle default state


Modified:
   trunk/ChangeLog
   trunk/engines/clearlooks/src/clearlooks_rc_style.c
   trunk/engines/clearlooks/src/clearlooks_style.c

Modified: trunk/engines/clearlooks/src/clearlooks_rc_style.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_rc_style.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_rc_style.c	Wed Jan 23 22:41:37 2008
@@ -133,7 +133,6 @@
 	clearlooks_rc->flags = 0;
 
 	clearlooks_rc->contrast = 1.0;
-	clearlooks_rc->reliefstyle = 1;
 	clearlooks_rc->menubarstyle = 0;
 	clearlooks_rc->toolbarstyle = 0;
 	clearlooks_rc->animation = FALSE;

Modified: trunk/engines/clearlooks/src/clearlooks_style.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_style.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_style.c	Wed Jan 23 22:41:37 2008
@@ -1225,7 +1225,15 @@
 	g_assert ((CLEARLOOKS_RC_STYLE (rc_style)->style >= 0) && (CLEARLOOKS_RC_STYLE (rc_style)->style < CL_NUM_STYLES));
 	clearlooks_style->style               = CLEARLOOKS_RC_STYLE (rc_style)->style;
 
-	clearlooks_style->reliefstyle         = CLEARLOOKS_RC_STYLE (rc_style)->reliefstyle;
+	if (!(CLEARLOOKS_RC_STYLE (rc_style)->flags & CL_FLAG_RELIEFSTYLE))
+	{
+		if (clearlooks_style->style == CL_STYLE_GUMMY)
+			clearlooks_style->reliefstyle = 1;
+		else
+			clearlooks_style->reliefstyle = 0;
+	}
+	else
+		clearlooks_style->reliefstyle = CLEARLOOKS_RC_STYLE (rc_style)->reliefstyle;
 	clearlooks_style->menubarstyle        = CLEARLOOKS_RC_STYLE (rc_style)->menubarstyle;
 	clearlooks_style->toolbarstyle        = CLEARLOOKS_RC_STYLE (rc_style)->toolbarstyle;
 	clearlooks_style->has_focus_color     = CLEARLOOKS_RC_STYLE (rc_style)->flags & CL_FLAG_FOCUS_COLOR;
@@ -1235,7 +1243,7 @@
 	clearlooks_style->radius              = CLAMP (CLEARLOOKS_RC_STYLE (rc_style)->radius, 0.0, 10.0);
 
 	if (clearlooks_style->has_focus_color)
-		clearlooks_style->focus_color = CLEARLOOKS_RC_STYLE (rc_style)->focus_color;
+		clearlooks_style->focus_color     = CLEARLOOKS_RC_STYLE (rc_style)->focus_color;
 	if (clearlooks_style->has_scrollbar_color)
 		clearlooks_style->scrollbar_color = CLEARLOOKS_RC_STYLE (rc_style)->scrollbar_color;
 }