murrine r55 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Wed Sep  3 11:24:36 2008
New Revision: 55
URL: http://svn.gnome.org/viewvc/murrine?rev=55&view=rev

Log:
2008-09-03  Andrea Cimitan  <andrea cimitan gmail com>

	* src/murrine_style.c (murrine_style_realize):
	Reworked contrast function, your themes may change


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	Wed Sep  3 11:24:36 2008
@@ -1771,9 +1771,20 @@
 	/* Lighter to darker */
 	for (i = 0; i < 9; i++)
 	{
-		murrine_shade (&bg_normal, (shades[i] < 1.0) ?
-		               (shades[i]/contrast) : (shades[i]*contrast),
-		               &murrine_style->colors.shade[i]);
+		if (contrast < 1.0)
+			murrine_shade (&bg_normal, (shades[i] < 1.0) ?
+			               shades[i]+(1.0-shades[i])*(1.0-contrast) :
+			               /* shades[i]-(shades[i]-1.0)*(1.0-contrast) */ 1.0,
+			               &murrine_style->colors.shade[i]);
+		else if (contrast > 1.0)
+			murrine_shade (&bg_normal, (shades[i] < 1.0) ?
+			               shades[i]-shades[i]*(contrast-1.0) :
+			               /* shades[i]+(shades[i]-1.0)*(contrast-1.0) */ 1.0,
+			               &murrine_style->colors.shade[i]);
+		else
+			murrine_shade (&bg_normal,
+			               shades[i],
+			               &murrine_style->colors.shade[i]);
 	}
 
 	spot_color.r = style->bg[GTK_STATE_SELECTED].red   / 65535.0;