murrine r147 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Mon Mar 16 00:59:25 2009
New Revision: 147
URL: http://svn.gnome.org/viewvc/murrine?rev=147&view=rev

Log:
2009-03-16  Andrea Cimitan  <andrea cimitan gmail com>

        * configure.ac:
        * src/cairo-support.c:
        * src/cairo-support.h:
        * src/murrine_draw.c (murrine_draw_button), (murrine_draw_entry):
        Renamed 0.90, removed set_border_gradient for this release.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/cairo-support.c
   trunk/src/cairo-support.h
   trunk/src/murrine_draw.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Mar 16 00:59:25 2009
@@ -1,4 +1,4 @@
-AC_INIT([murrine], [0.60])
+AC_INIT([murrine], [0.90])
 AC_CONFIG_SRCDIR([README])
 
 AM_INIT_AUTOMAKE

Modified: trunk/src/cairo-support.c
==============================================================================
--- trunk/src/cairo-support.c	(original)
+++ trunk/src/cairo-support.c	Mon Mar 16 00:59:25 2009
@@ -803,26 +803,6 @@
 }
 
 void
-murrine_set_border_gradient (cairo_t *cr,
-                             const MurrineRGB *color,
-                             double highlight,
-                             int x, int y, int width, int height)
-{
-	cairo_pattern_t *pat;
-
-	MurrineRGB top_shade, bottom_shade;
-	murrine_shade (color, highlight, &top_shade);
-	murrine_shade (color, 1.0/highlight, &bottom_shade);
-
-	pat = cairo_pattern_create_linear (x, y, width+x, height+y);
-	murrine_pattern_add_color_stop_rgb (pat, 0.0, &top_shade);
-	murrine_pattern_add_color_stop_rgb (pat, 1.0, &bottom_shade);
-
-	cairo_set_source (cr, pat);
-	cairo_pattern_destroy (pat);
-}
-
-void
 rotate_mirror_translate (cairo_t *cr,
                          double radius, double x, double y,
                          boolean mirror_horizontally, boolean mirror_vertically)

Modified: trunk/src/cairo-support.h
==============================================================================
--- trunk/src/cairo-support.h	(original)
+++ trunk/src/cairo-support.h	Mon Mar 16 00:59:25 2009
@@ -91,11 +91,6 @@
                                            int x, int y, int width, int height,
                                            boolean gradients, boolean alpha);
 
-G_GNUC_INTERNAL void murrine_set_border_gradient (cairo_t *cr,
-                                                  const MurrineRGB *color,
-                                                  double highlight,
-                                                  int x, int y, int width, int height);
-
 G_GNUC_INTERNAL void murrine_draw_glaze (cairo_t *cr,
                                          const MurrineRGB *fill,
                                          double glow_shade,

Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c	(original)
+++ trunk/src/murrine_draw.c	Mon Mar 16 00:59:25 2009
@@ -239,7 +239,6 @@
 
 	/* Draw the border */
 	murrine_set_color_rgb (cr, &border);
-	//murrine_set_border_gradient (cr, &border, widget->disabled ? 1.0 : widget->active ? 0.9 : 1.1, 0, yos+0.5, 0, height-(yos*2)-1);
 	murrine_rounded_rectangle (cr, xos+0.5, yos+0.5, width-(xos*2)-1, height-(yos*2)-1, widget->roundness, widget->corners);
 	cairo_stroke (cr);
 }
@@ -286,7 +285,6 @@
 
 	/* Draw the border */
 	murrine_set_color_rgb (cr, widget->focus ? &colors->spot[2] : border);
-	//murrine_set_border_gradient (cr, widget->focus ? &colors->spot[2] : border, widget->disabled ? 1.0 : 0.9, 0, 1, 0, height-3);
 	murrine_rounded_rectangle (cr, 1, 1, width-3, height-3, radius, widget->corners);
 	cairo_stroke (cr);
 }