murrine r56 - in trunk: . src

[acimitan svn gnome org]

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

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

	* src/murrine_draw.c (murrine_draw_tab), (murrine_draw_separator),
	(murrine_draw_toolbar), (murrine_draw_statusbar),
	(murrine_draw_resize_grip):
	* src/murrine_draw_rgba.c (murrine_rgba_draw_tab):
	* src/murrine_style.c (murrine_style_realize):
	More fixes for the contrast function


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

Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c	(original)
+++ trunk/src/murrine_draw.c	Wed Sep  3 11:49:54 2008
@@ -1098,7 +1098,7 @@
 		cairo_pattern_destroy (pattern);
 
 		cairo_set_line_width (cr, 1.0);
-		murrine_set_color_rgba (cr, &colors->shade[0], 0.2);
+		murrine_set_color_rgba (cr, &colors->shade[0], 0.24);
 
 		if (widget->roundness < 2)
 			cairo_rectangle (cr, 1, 1, width-3, height-3);
@@ -1156,7 +1156,7 @@
 		cairo_pattern_destroy (pattern);
 
 		cairo_set_line_width (cr, 1.0);
-		murrine_set_color_rgba (cr, &colors->shade[0], 0.4);
+		murrine_set_color_rgba (cr, &colors->shade[0], 0.48);
 
 		if (widget->roundness < 2)
 			cairo_rectangle (cr, 1, 1, width-3, height-3);
@@ -1178,9 +1178,8 @@
                         const SeparatorParameters *separator,
                         int x, int y, int width, int height)
 {
-	const MurrineRGB *dark   = &colors->shade[3];
-	MurrineRGB highlight;
-	murrine_shade (dark, 1.3, &highlight);
+	const MurrineRGB *dark = &colors->shade[3];
+	const MurrineRGB *highlight = &colors->shade[0];
 
 	if (separator->horizontal)
 	{
@@ -1195,7 +1194,7 @@
 #ifndef HAVE_MACMENU
 		cairo_move_to         (cr, 0.0,   1.0);
 		cairo_line_to         (cr, width, 1.0);
-		murrine_set_color_rgb (cr, &highlight);
+		murrine_set_color_rgb (cr, highlight);
 		cairo_stroke          (cr);
 #endif
 	}
@@ -1212,7 +1211,7 @@
 #ifndef HAVE_MACMENU
 		cairo_move_to         (cr, 1.0, 0.0);
 		cairo_line_to         (cr, 1.0, height);
-		murrine_set_color_rgb (cr, &highlight);
+		murrine_set_color_rgb (cr, highlight);
 		cairo_stroke          (cr);
 #endif
 	}
@@ -1374,8 +1373,7 @@
 {
 	const MurrineRGB *dark = &colors->shade[3];
 	const MurrineRGB *fill = &colors->bg[0];
-	MurrineRGB top;
-	murrine_shade (dark, 1.3, &top);
+	const MurrineRGB *top  = &colors->shade[0];
 
 	cairo_set_line_width (cr, 1.0);
 	cairo_translate      (cr, x, y);
@@ -1439,7 +1437,7 @@
 		{
 			cairo_move_to         (cr, 0, 0.5);
 			cairo_line_to         (cr, width, 0.5);
-			murrine_set_color_rgb (cr, &top);
+			murrine_set_color_rgb (cr, top);
 			cairo_stroke          (cr);
 		}
 	}
@@ -1898,9 +1896,8 @@
                         const WidgetParameters *widget,
                         int x, int y, int width, int height)
 {
-	const MurrineRGB *dark   = &colors->shade[3];
-	MurrineRGB highlight;
-	murrine_shade (dark, 1.3, &highlight);
+	const MurrineRGB *dark = &colors->shade[3];
+	const MurrineRGB *highlight = &colors->shade[0];
 
 	cairo_set_line_width  (cr, 1);
 	cairo_translate       (cr, x, y+0.5);
@@ -1912,7 +1909,7 @@
 	cairo_translate       (cr, 0, 1);
 	cairo_move_to         (cr, 0, 0);
 	cairo_line_to         (cr, width, 0);
-	murrine_set_color_rgb (cr, &highlight);
+	murrine_set_color_rgb (cr, highlight);
 	cairo_stroke          (cr);
 }
 
@@ -2379,9 +2376,8 @@
                           const ResizeGripParameters *grip,
                           int x, int y, int width, int height)
 {
-	const MurrineRGB *dark   = &colors->shade[3];
-	MurrineRGB highlight;
-	murrine_shade (dark, 1.3, &highlight);
+	const MurrineRGB *dark = &colors->shade[3];
+	const MurrineRGB *highlight = &colors->shade[0];
 	int lx, ly;
 
 	cairo_set_line_width (cr, 1.0);
@@ -2393,7 +2389,7 @@
 			int ny = (3.5-ly) * 3;
 			int nx = lx * 3;
 
-			murrine_set_color_rgb (cr, &highlight);
+			murrine_set_color_rgb (cr, highlight);
 			cairo_rectangle (cr, x+width-nx-1, y+height-ny-1, 2, 2);
 			cairo_fill (cr);
 

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Wed Sep  3 11:49:54 2008
@@ -1218,7 +1218,7 @@
 
 		cairo_set_line_width (cr, 1.0);
 		cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-		murrine_set_color_rgba (cr, &colors->shade[0], 0.2);
+		murrine_set_color_rgba (cr, &colors->shade[0], 0.24);
 
 		if (widget->roundness < 2)
 			cairo_rectangle (cr, 1, 1, width-3, height-3);
@@ -1277,7 +1277,7 @@
 
 		cairo_set_line_width (cr, 1.0);
 		cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-		murrine_set_color_rgba (cr, &colors->shade[0], 0.4);
+		murrine_set_color_rgba (cr, &colors->shade[0], 0.48);
 
 		if (widget->roundness < 2)
 			cairo_rectangle (cr, 1, 1, width-3, height-3);

Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c	(original)
+++ trunk/src/murrine_style.c	Wed Sep  3 11:49:54 2008
@@ -1754,7 +1754,7 @@
 murrine_style_realize (GtkStyle * style)
 {
 	MurrineStyle *murrine_style = MURRINE_STYLE (style);
-	double shades[] = {1.15, 0.95, 0.896, 0.82, 0.75, 0.665, 0.5, 0.45, 0.4};
+	double shades[] = {1.065, 0.95, 0.896, 0.82, 0.75, 0.665, 0.5, 0.45, 0.4};
 	MurrineRGB spot_color;
 	MurrineRGB bg_normal;
 	double contrast;
@@ -1774,12 +1774,12 @@
 		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,
+			               shades[i]-(shades[i]-1.0)*(1.0-contrast),
 			               &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,
+			               shades[i]+(shades[i]-1.0)*(contrast-1.0),
 			               &murrine_style->colors.shade[i]);
 		else
 			murrine_shade (&bg_normal,