murrine r59 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Tue Sep  9 10:55:40 2008
New Revision: 59
URL: http://svn.gnome.org/viewvc/murrine?rev=59&view=rev

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

	* src/murrine_draw.c (murrine_draw_progressbar_trough),
	(murrine_draw_scrollbar_trough):
	* src/murrine_draw_rgba.c (murrine_rgba_draw_progressbar_trough),
	(murrine_rgba_draw_scrollbar_trough):
	* src/murrine_style.c (murrine_style_realize):
	Do not change progressbar/scrollbar trough with 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	Tue Sep  9 10:55:40 2008
@@ -527,6 +527,9 @@
                                  int x, int y, int width, int height)
 {
 	const MurrineRGB *border = &colors->shade[4];
+	MurrineRGB fill; 
+
+	murrine_shade (&widget->parentbg, 0.95, &fill);
 
 	cairo_set_line_width (cr, 1.0);
 
@@ -537,7 +540,7 @@
 
 	/* Create trough box */
 	cairo_rectangle (cr, x+1, y+1, width-2, height-2);
-	murrine_set_color_rgba (cr, &colors->shade[1], 0.44);
+	murrine_set_color_rgba (cr, &fill, 0.44);
 	cairo_fill (cr);
 
 	/* Draw border */
@@ -1554,8 +1557,10 @@
                                const ScrollBarParameters *scrollbar,
                                int x, int y, int width, int height)
 {
-	const MurrineRGB *bg     = &colors->shade[scrollbar->stepperstyle < 1 ? 1 : 0];
 	const MurrineRGB *border = &colors->shade[scrollbar->stepperstyle < 1 ? 3 : 4];
+	MurrineRGB fill;
+
+	murrine_shade (&widget->parentbg, scrollbar->stepperstyle < 1 ? 0.95 : 1.065, &fill);
 
 	cairo_set_line_width (cr, 1.0);
 
@@ -1573,7 +1578,7 @@
 
 	/* Draw fill */
 	clearlooks_rounded_rectangle (cr, 1, 0, width-2, height, widget->roundness, widget->corners);
-	murrine_set_color_rgba (cr, bg, 0.4);
+	murrine_set_color_rgba (cr, &fill, 0.4);
 	cairo_fill (cr);
 
 	/* Draw border */

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Tue Sep  9 10:55:40 2008
@@ -488,6 +488,9 @@
                                       int x, int y, int width, int height)
 {
 	const MurrineRGB *border = &colors->shade[4];
+	MurrineRGB fill; 
+
+	murrine_shade (&widget->parentbg, 0.95, &fill);
 
 	cairo_set_line_width (cr, 1.0);
 	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
@@ -501,7 +504,7 @@
 
 	/* Create trough box */
 	cairo_rectangle (cr, x+1, y+1, width-2, height-2);
-	murrine_set_color_rgba (cr, &colors->shade[1], 0.8);
+	murrine_set_color_rgba (cr, &fill, 0.8);
 	cairo_fill (cr);
 
 	/* Draw border */
@@ -1299,8 +1302,10 @@
                                     const ScrollBarParameters *scrollbar,
                                     int x, int y, int width, int height)
 {
-	const MurrineRGB *bg     = &colors->shade[scrollbar->stepperstyle < 1 ? 1 : 0];
 	const MurrineRGB *border = &colors->shade[scrollbar->stepperstyle < 1 ? 4 : 5];
+	MurrineRGB fill;
+
+	murrine_shade (&widget->parentbg, scrollbar->stepperstyle < 1 ? 0.95 : 1.065, &fill);
 
 	cairo_set_line_width (cr, 1.0);
 
@@ -1318,7 +1323,7 @@
 
 	/* Draw fill */
 	clearlooks_rounded_rectangle (cr, 1, 0, width-2, height, widget->roundness, widget->corners);
-	murrine_set_color_rgba (cr, bg, 0.4);
+	murrine_set_color_rgba (cr, &fill, 0.4);
 	cairo_fill (cr);
 
 	/* Draw border */

Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c	(original)
+++ trunk/src/murrine_style.c	Tue Sep  9 10:55:40 2008
@@ -1785,7 +1785,7 @@
 		               get_contrast(shades[i], contrast),
 		               &murrine_style->colors.shade[i]);
 	}
-	spots[2]=get_contrast(spots[2], contrast);
+	spots[2] = get_contrast(spots[2], contrast);
 
 	spot_color.r = style->bg[GTK_STATE_SELECTED].red   / 65535.0;
 	spot_color.g = style->bg[GTK_STATE_SELECTED].green / 65535.0;