murrine r81 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Mon Sep 29 00:34:07 2008
New Revision: 81
URL: http://svn.gnome.org/viewvc/murrine?rev=81&view=rev

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

	* configure.ac:
	* src/murrine_draw.c (murrine_draw_menubar),
	(murrine_draw_toolbar), (murrine_draw_separator):
	* src/murrine_draw_rgba.c (murrine_rgba_draw_menubar),
	(murrine_rgba_draw_toolbar), (murrine_rgba_draw_separator):
	Removed --enable-macmenu. You can use other options.


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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Sep 29 00:34:07 2008
@@ -27,10 +27,6 @@
               [  --enable-animation      compile murrine with animation support],
               [animation=$enableval],
               [animation="no"], )
-AC_ARG_ENABLE(macmenu,
-              [  --enable-macmenu        compile murrine with mac menubar patches],
-              [macmenu=$enableval],
-              [macmenu="no"], )
 AC_ARG_ENABLE(animationrtl,
               [  --enable-animationrtl   compile murrine with progressbar animation from right to left],
               [animationrtl=$enableval],
@@ -56,10 +52,6 @@
 	AC_DEFINE_UNQUOTED(HAVE_ANIMATION, 1, [Defines whether to compile with animation support])
 fi
 
-if test $macmenu = "yes"; then
-	AC_DEFINE_UNQUOTED(HAVE_MACMENU, 1, [Defines whether to compile with mac menubar patches])
-fi
-
 if test $animationrtl = "yes"; then
 	AC_DEFINE_UNQUOTED(HAVE_ANIMATIONRTL, 1, [Defines whether to compile with progressbar animation from right to left])
 fi

Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c	(original)
+++ trunk/src/murrine_draw.c	Mon Sep 29 00:34:07 2008
@@ -697,7 +697,6 @@
 	/* Draw bottom line */
 	if (menubarstyle == 1 && widget->glazestyle == 2)
 		cairo_rectangle (cr, 0.5, 0.5, width-1, height-1);
-#ifndef HAVE_MACMENU
 	else
 	{
 		cairo_set_line_width (cr, 1.0);
@@ -706,7 +705,6 @@
 	}
 	murrine_set_color_rgb (cr, &colors->shade[3]);
 	cairo_stroke          (cr);
-#endif
 }
 
 /* We can't draw transparent things here, since it will be called on the same
@@ -726,10 +724,6 @@
 	cairo_translate      (cr, x, y);
 	cairo_rectangle (cr, 0, 0, width, height);
 
-#ifdef HAVE_MACMENU
-	murrine_set_color_rgb (cr, fill);
-	cairo_fill (cr);
-#else
 	/* Glass toolbar */
 	if (toolbar->style == 1)
 	{
@@ -760,7 +754,6 @@
 			cairo_stroke          (cr);
 		}
 	}
-#endif
 
 	/* Draw shadow */
 	murrine_set_color_rgb (cr, dark);
@@ -1106,12 +1099,10 @@
 		cairo_line_to         (cr, width+1, 0.0);
 		cairo_stroke          (cr);
 
-#ifndef HAVE_MACMENU
 		murrine_set_color_rgb (cr, highlight);
 		cairo_move_to         (cr, 0.0,   1.0);
 		cairo_line_to         (cr, width, 1.0);
 		cairo_stroke          (cr);
-#endif
 	}
 	else
 	{
@@ -1123,12 +1114,10 @@
 		cairo_line_to         (cr, 0.0, height);
 		cairo_stroke          (cr);
 
-#ifndef HAVE_MACMENU
 		murrine_set_color_rgb (cr, highlight);
 		cairo_move_to         (cr, 1.0, 0.0);
 		cairo_line_to         (cr, 1.0, height);
 		cairo_stroke          (cr);
-#endif
 	}
 }
 

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Mon Sep 29 00:34:07 2008
@@ -649,7 +649,6 @@
 	/* Draw bottom line */
 	if (menubarstyle == 1 && widget->glazestyle == 2)
 		cairo_rectangle (cr, 0.5, 0.5, width-1, height-1);
-#ifndef HAVE_MACMENU
 	else
 	{
 		cairo_set_line_width (cr, 1.0);
@@ -659,7 +658,6 @@
 
 	murrine_set_color_rgb (cr, &colors->shade[4]);
 	cairo_stroke          (cr);
-#endif
 }
 
 static void
@@ -679,11 +677,6 @@
 	cairo_set_line_width (cr, 1.0);
 	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
-#ifdef HAVE_MACMENU
-	murrine_set_color_rgba (cr, fill, WINDOW_OPACITY);
-	cairo_fill (cr);
-	cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-#else
 	/* Glass toolbar */
 	if (toolbar->style == 1)
 	{
@@ -722,7 +715,6 @@
 			cairo_stroke           (cr);
 		}
 	}
-#endif
 
 	/* Draw shadow */
 	murrine_set_color_rgb (cr, dark);
@@ -874,12 +866,10 @@
 		murrine_set_color_rgb (cr, dark);
 		cairo_stroke          (cr);
 
-#ifndef HAVE_MACMENU
 		cairo_move_to          (cr, 0.0,   1.0);
 		cairo_line_to          (cr, width, 1.0);
 		murrine_set_color_rgba (cr, highlight, 0.5);
 		cairo_stroke           (cr);
-#endif
 	}
 	else
 	{
@@ -891,12 +881,10 @@
 		murrine_set_color_rgb (cr, dark);
 		cairo_stroke          (cr);
 
-#ifndef HAVE_MACMENU
 		cairo_move_to          (cr, 1.0, 0.0);
 		cairo_line_to          (cr, 1.0, height);
 		murrine_set_color_rgba (cr, highlight, 0.5);
 		cairo_stroke           (cr);
-#endif
 	}
 }