murrine r11 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Sat Feb 16 00:37:26 2008
New Revision: 11
URL: http://svn.gnome.org/viewvc/murrine?rev=11&view=rev

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

	* src/cairo-support.c: (murrine_draw_innerborder):
	* src/murrine_style.c: (murrine_style_draw_flat_box):
	Code polished


Modified:
   trunk/ChangeLog
   trunk/src/cairo-support.c
   trunk/src/murrine_style.c
   trunk/src/murrine_style.h

Modified: trunk/src/cairo-support.c
==============================================================================
--- trunk/src/cairo-support.c	(original)
+++ trunk/src/cairo-support.c	Sat Feb 16 00:37:26 2008
@@ -463,7 +463,6 @@
 {
 	cairo_pattern_t *pattern;
 	MurrineRGB shade1, shade2, shade3, shade4;
-	MurrineRGB fill_shade;
 	double alpha_value = 1.0;
 	if (mrn_gradient.use_rgba)
 	{
@@ -476,7 +475,6 @@
 		murrine_shade (highlight_color, mrn_gradient.gradient_stop_2, &shade2);
 		murrine_shade (highlight_color, mrn_gradient.gradient_stop_3, &shade3);
 		murrine_shade (highlight_color, mrn_gradient.gradient_stop_4, &shade4);
-		murrine_shade (fill, mrn_gradient.gradient_stop_4, &fill_shade);
 	}
 	else
 	{
@@ -484,7 +482,6 @@
 		murrine_shade (highlight_color, 1.0, &shade2);
 		murrine_shade (highlight_color, 1.0, &shade3);
 		murrine_shade (highlight_color, 1.0, &shade4);
-		murrine_shade (fill, 1.0, &fill_shade);
 	}
 
 	double fill_pos = 1.0-(1.0/(!horizontal ? (double)(width) : (double)(height)));
@@ -499,8 +496,8 @@
 	cairo_pattern_add_color_stop_rgba (pattern, 0.5,      shade2.r, shade2.g, shade2.b, 0.5*alpha_value);
 	cairo_pattern_add_color_stop_rgba (pattern, 0.5,      shade3.r, shade3.g, shade3.b, 0.5*alpha_value);
 	cairo_pattern_add_color_stop_rgba (pattern, fill_pos, shade4.r, shade4.g, shade4.b, 0.5*alpha_value);
-	cairo_pattern_add_color_stop_rgba (pattern, fill_pos, fill_shade.r, fill_shade.g, fill_shade.b, 0.0);
-	cairo_pattern_add_color_stop_rgba (pattern, 1.0,      fill_shade.r, fill_shade.g, fill_shade.b, 0.0);
+	cairo_pattern_add_color_stop_rgba (pattern, fill_pos, shade4.r, shade4.g, shade4.b, 0.0);
+	cairo_pattern_add_color_stop_rgba (pattern, 1.0,      shade4.r, shade4.g, shade4.b, 0.0);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern);
 

Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c	(original)
+++ trunk/src/murrine_style.c	Sat Feb 16 00:37:26 2008
@@ -285,7 +285,7 @@
 					                                                 colors->bg[0].b, WINDOW_OPACITY);
 					cairo_pattern_add_color_stop_rgba (pattern, 0.5, colors->bg[0].r,
 					                                                 colors->bg[0].g,
-					                                                 colors->bg[0].b, 0.8);
+					                                                 colors->bg[0].b, (WINDOW_OPACITY-0.04));
 					cairo_pattern_add_color_stop_rgba (pattern, 1.0, colors->bg[0].r,
 					                                                 colors->bg[0].g,
 					                                                 colors->bg[0].b, WINDOW_OPACITY);

Modified: trunk/src/murrine_style.h
==============================================================================
--- trunk/src/murrine_style.h	(original)
+++ trunk/src/murrine_style.h	Sat Feb 16 00:37:26 2008
@@ -43,9 +43,9 @@
 	GtkStyle parent_instance;
 
 	MurrineColors colors;
-	
+
 	MurrineStyles style;
-	
+
 	double   contrast;
 	double   gradient_stop_1;
 	double   gradient_stop_2;
@@ -80,7 +80,7 @@
 struct _MurrineStyleClass
 {
 	GtkStyleClass parent_class;
-	
+
 	MurrineStyleFunctions style_functions[MRN_NUM_DRAW_STYLES];
 };