murrine r36 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Fri Apr 11 00:48:55 2008
New Revision: 36
URL: http://svn.gnome.org/viewvc/murrine?rev=36&view=rev

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

	* src/murrine_draw.c: (murrine_draw_entry),
	(murrine_scale_draw_gradient), (murrine_draw_scale_trough),
	(murrine_draw_slider_handle), (murrine_draw_progressbar_trough):
	* src/murrine_draw_rgba.c: (murrine_rgba_draw_entry),
	(murrine_scale_draw_gradient), (murrine_rgba_draw_scale_trough),
	(murrine_rgba_draw_progressbar_trough):
	Progressbar trough updated.


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

Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c	(original)
+++ trunk/src/murrine_draw.c	Fri Apr 11 00:48:55 2008
@@ -358,7 +358,7 @@
 		murrine_set_color_rgb (cr, &colors->spot[1]);
 		cairo_stroke(cr);
 	}
-	else
+	else if (widget->mrn_gradient.gradients)
 	{
 		MurrineRGB shadow;
 		murrine_shade (border, 0.925, &shadow);
@@ -410,7 +410,7 @@
                              boolean alpha)
 {
 	if (alpha)
-		murrine_set_color_rgba (cr, c1, 0.4);
+		murrine_set_color_rgba (cr, c1, 0.44);
 	else
 		murrine_set_color_rgb (cr, c1);
 
@@ -479,12 +479,12 @@
 
 	cairo_translate (cr, 1, 1);
 
-	murrine_scale_draw_gradient (cr, &fill,
+	murrine_scale_draw_gradient (cr, &fill, /* fill */
 	                             &colors->shade[4], /* border */
 	                             0, 0, trough_width, trough_height,
 	                             TRUE);
 
-	murrine_scale_draw_gradient (cr, &colors->spot[1],
+	murrine_scale_draw_gradient (cr, &colors->spot[1], /* fill */
 	                             &colors->spot[2], /* border */
 	                             fill_x, fill_y, fill_width, fill_height,
 	                             FALSE);
@@ -509,7 +509,7 @@
 	}
 
 	int num_handles = 2;
-	if (width%2 != 0)
+	if (width&1)
 		num_handles = 3;
 
 	int bar_x = width/2 - num_handles;
@@ -531,7 +531,7 @@
                                  const WidgetParameters *widget,
                                  int x, int y, int width, int height)
 {
-	const MurrineRGB *border = &colors->shade[3];
+	const MurrineRGB *border = &colors->shade[4];
 
 	cairo_set_line_width (cr, 1.0);
 
@@ -542,13 +542,39 @@
 
 	/* Create trough box */
 	cairo_rectangle (cr, x+1, y+1, width-2, height-2);
-	murrine_set_color_rgba (cr, &colors->shade[1], 0.4);
+	murrine_set_color_rgba (cr, &colors->shade[1], 0.46);
 	cairo_fill (cr);
 
 	/* Draw border */
 	cairo_rectangle (cr, x+0.5, y+0.5, width-1, height-1);
-	murrine_set_color_rgba (cr, border, 0.8);
+	murrine_set_color_rgba (cr, border, 0.74);
 	cairo_stroke (cr);
+
+	if (widget->mrn_gradient.gradients)
+	{
+		cairo_pattern_t  *pattern;
+		MurrineRGB        shadow;
+
+		murrine_shade (border, 0.94, &shadow);
+
+		/* Top shadow */
+		cairo_rectangle (cr, x+1, y+1, width-2, 4);
+		pattern = cairo_pattern_create_linear (x, y, x, y+4);
+		cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.24);
+		cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.);
+		cairo_set_source (cr, pattern);
+		cairo_fill (cr);
+		cairo_pattern_destroy (pattern);
+
+		/* Left shadow */
+		cairo_rectangle (cr, x+1, y+1, 4, height-2);
+		pattern = cairo_pattern_create_linear (x, y, x+4, y);
+		cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.24);
+		cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.);
+		cairo_set_source (cr, pattern);
+		cairo_fill (cr);
+		cairo_pattern_destroy (pattern);
+	}
 }
 
 static void

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Fri Apr 11 00:48:55 2008
@@ -375,7 +375,7 @@
 		murrine_set_color_rgba (cr, &colors->spot[1], 0.6);
 		cairo_stroke(cr);
 	}
-	else
+	else if (widget->mrn_gradient.gradients)
 	{
 		MurrineRGB highlight;
 		murrine_shade (base, 1.15, &highlight);
@@ -406,7 +406,7 @@
                              boolean alpha)
 {
 	if (alpha)
-		murrine_set_color_rgba (cr, c1, 0.4);
+		murrine_set_color_rgba (cr, c1, 0.46);
 	else
 		murrine_set_color_rgb (cr, c1);
 
@@ -475,12 +475,12 @@
 
 	cairo_translate (cr, 1, 1);
 
-	murrine_scale_draw_gradient (cr, &fill,
+	murrine_scale_draw_gradient (cr, &fill, /* fill */
 	                             &colors->shade[5], /* border */
 	                             0, 0, trough_width, trough_height,
 	                             TRUE);
 
-	murrine_scale_draw_gradient (cr, &colors->spot[1],
+	murrine_scale_draw_gradient (cr, &colors->spot[1], /* fill */
 	                             &colors->spot[2], /* border */
 	                             fill_x, fill_y, fill_width, fill_height,
 	                             FALSE);
@@ -499,7 +499,7 @@
 
 	/* Fill with bg color */
 	cairo_rectangle (cr, x, y, width, height);
-	murrine_set_color_rgba (cr, &colors->bg[widget->state_type], 0.8);
+	murrine_set_color_rgba (cr, &colors->bg[widget->state_type], WINDOW_OPACITY);
 	cairo_fill (cr);
 
 	cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
@@ -513,6 +513,32 @@
 	cairo_rectangle (cr, x+0.5, y+0.5, width-1, height-1);
 	murrine_set_color_rgba (cr, border, 0.8);
 	cairo_stroke (cr);
+
+	if (widget->mrn_gradient.gradients)
+	{
+		cairo_pattern_t  *pattern;
+		MurrineRGB        shadow;
+
+		murrine_shade (border, 0.94, &shadow);
+
+		/* Top shadow */
+		cairo_rectangle (cr, x+1, y+1, width-2, 4);
+		pattern = cairo_pattern_create_linear (x, y, x, y+4);
+		cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.26);
+		cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.);
+		cairo_set_source (cr, pattern);
+		cairo_fill (cr);
+		cairo_pattern_destroy (pattern);
+
+		/* Left shadow */
+		cairo_rectangle (cr, x+1, y+1, 4, height-2);
+		pattern = cairo_pattern_create_linear (x, y, x+4, y);
+		cairo_pattern_add_color_stop_rgba (pattern, 0.0, shadow.r, shadow.g, shadow.b, 0.26);
+		cairo_pattern_add_color_stop_rgba (pattern, 1.0, shadow.r, shadow.g, shadow.b, 0.);
+		cairo_set_source (cr, pattern);
+		cairo_fill (cr);
+		cairo_pattern_destroy (pattern);
+	}
 }
 
 static void