murrine r106 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Mon Dec 29 01:02:15 2008
New Revision: 106
URL: http://svn.gnome.org/viewvc/murrine?rev=106&view=rev

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

	* src/murrine_draw.c (murrine_draw_toolbar):
	* src/murrine_draw_rgba.c (murrine_rgba_draw_toolbar):
	Added a small highlight on toolbarstyle = 2.


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

Modified: trunk/src/cairo-support.c
==============================================================================
--- trunk/src/cairo-support.c	(original)
+++ trunk/src/cairo-support.c	Mon Dec 29 01:02:15 2008
@@ -717,7 +717,7 @@
 		murrine_set_gradient (cr, &shadow, mrn_gradient, x, y, 0, height, mrn_gradient.gradients, TRUE);
 		cairo_fill (cr);
 	}
-	
+
 	if (glow_ratio != 1.0)
 	{
 		MurrineRGB glow;

Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c	(original)
+++ trunk/src/murrine_draw.c	Mon Dec 29 01:02:15 2008
@@ -690,6 +690,7 @@
 		case 0:
 			murrine_set_color_rgb (cr, fill);
 			cairo_fill (cr);
+
 			/* Draw highlight */
 			if (!toolbar->topmost)
 			{
@@ -717,8 +718,17 @@
 			murrine_pattern_add_color_stop_rgb (pat, 0.0, fill);
 			murrine_pattern_add_color_stop_rgb (pat, 1.0, &lower);
 			cairo_set_source (cr, pat);
-			cairo_fill (cr);
 			cairo_pattern_destroy (pat);
+			cairo_fill (cr);
+
+			/* Draw highlight */
+			if (!toolbar->topmost)
+			{
+				cairo_move_to         (cr, 0, 0.5);
+				cairo_line_to         (cr, width, 0.5);
+				murrine_set_color_rgb (cr, top);
+				cairo_stroke          (cr);
+			}
 			break;
 		}
 	}

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Mon Dec 29 01:02:15 2008
@@ -671,10 +671,19 @@
 			murrine_pattern_add_color_stop_rgba (pat, 0.0, fill, TOOLBAR_OPACITY);
 			murrine_pattern_add_color_stop_rgba (pat, 1.0, &lower, TOOLBAR_OPACITY);
 			cairo_set_source (cr, pat);
-			cairo_fill (cr);
 			cairo_pattern_destroy (pat);
+			cairo_fill (cr);
 
 			cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+
+			/* Draw highlight */
+			if (!toolbar->topmost)
+			{
+				cairo_move_to         (cr, 0, 0.5);
+				cairo_line_to         (cr, width, 0.5);
+				murrine_set_color_rgb (cr, top);
+				cairo_stroke          (cr);
+			}
 			break;
 		}
 	}