murrine r123 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Sun Jan  4 03:27:35 2009
New Revision: 123
URL: http://svn.gnome.org/viewvc/murrine?rev=123&view=rev

Log:
2009-01-04  Andrea Cimitan  <andrea cimitan gmail com>

	* src/cairo-support.c (murrine_draw_lightborder),
	(murrine_draw_glaze):
	Removed horizontal parameter to lightborder,
	this fixes spinbuttons, but could break vertical widgets,
	please test and report bugs if you see a misplacement
	of the lightborder.


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

Modified: trunk/src/cairo-support.c
==============================================================================
--- trunk/src/cairo-support.c	(original)
+++ trunk/src/cairo-support.c	Sun Jan  4 03:27:35 2009
@@ -613,7 +613,7 @@
                           const MurrineRGB *fill,
                           MurrineGradients mrn_gradient,
                           double x, double y, int width, int height,
-                          boolean gradients, boolean horizontal,
+                          boolean gradients,
                           int glazestyle, int lightborderstyle,
                           int radius, uint8 corners)
 {
@@ -628,18 +628,14 @@
 
 	cairo_save (cr);
 
-	if (!horizontal)
-		murrine_exchange_axis (cr, (int*)&x, (int*)&y, &width, &height);
-
-	double fill_pos = 1.0-1.0/(!horizontal ? (double)width : (double)height);
+	double fill_pos = 1.0-1.0/(double)height;
 	if (corners == MRN_CORNER_ALL && radius > 2)
-		fill_pos = 1.0-(((double)radius-1.0)/2.0)/
-		                 (!horizontal ? (double)width : (double)height);
+		fill_pos = 1.0-(((double)radius-1.0)/2.0)/(double)height;
 
 	radius < 2 ? cairo_rectangle (cr, x, y, width, height) :
 	             clearlooks_rounded_rectangle (cr, x, y, width, height, radius-1, corners);
 
-	pat = cairo_pattern_create_linear (x, y, !horizontal ? width+x : x, !horizontal ? y : height+y);
+	pat = cairo_pattern_create_linear (x, y, x, height+y);
 	murrine_pattern_add_color_stop_rgba (pat, 0.00,     &shade1, 0.5*alpha_value);
 	murrine_pattern_add_color_stop_rgba (pat, 0.49,     &shade2, 0.5*alpha_value);
 	murrine_pattern_add_color_stop_rgba (pat, 0.49,     &shade3, 0.5*alpha_value);
@@ -757,7 +753,7 @@
 
 		murrine_draw_lightborder (cr, &highlight, fill, mrn_gradient,
 		                          x+0.5, y+0.5, width-1, height-1,
-		                          mrn_gradient.gradients, horizontal,
+		                          mrn_gradient.gradients,
 		                          widget->glazestyle, widget->lightborderstyle,
 		                          radius, corners);
 	}