murrine r104 - in trunk: . schema src



Author: acimitan
Date: Sun Dec 28 19:12:29 2008
New Revision: 104
URL: http://svn.gnome.org/viewvc/murrine?rev=104&view=rev

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

	* schema/murrine.xml.in.in:
	* src/cairo-support.c (murrine_draw_bottom_glow),
	(murrine_draw_centered_glow), (murrine_draw_horizontal_glow),
	(murrine_draw_top_glow), (murrine_draw_glaze):
	* src/cairo-support.h:
	* src/murrine_draw.c (murrine_draw_button),
	(murrine_draw_progressbar_fill), (murrine_draw_menubar),
	(murrine_draw_toolbar), (murrine_draw_list_view_header),
	(murrine_draw_menuitem), (murrine_draw_scrollbar_stepper),
	(murrine_draw_scrollbar_slider):
	* src/murrine_draw_rgba.c (murrine_rgba_draw_button),
	(murrine_rgba_draw_progressbar_fill), (murrine_rgba_draw_menubar),
	(murrine_rgba_draw_toolbar), (murrine_rgba_draw_scrollbar_stepper),
	(murrine_rgba_draw_scrollbar_slider):
	* src/murrine_rc_style.c (murrine_rc_style_init),
	(murrine_rc_style_parse), (murrine_rc_style_merge):
	* src/murrine_rc_style.h:
	* src/murrine_style.c (murrine_set_widget_parameters),
	(murrine_style_init_from_rc), (murrine_style_copy):
	* src/murrine_style.h:
	* src/murrine_types.h:
	5 glowstyle options: top, bottom, top and bottom, horizontal, centered.


Modified:
   trunk/ChangeLog
   trunk/schema/murrine.xml.in.in
   trunk/src/cairo-support.c
   trunk/src/cairo-support.h
   trunk/src/murrine_draw.c
   trunk/src/murrine_draw_rgba.c
   trunk/src/murrine_rc_style.c
   trunk/src/murrine_rc_style.h
   trunk/src/murrine_style.c
   trunk/src/murrine_style.h
   trunk/src/murrine_types.h

Modified: trunk/schema/murrine.xml.in.in
==============================================================================
--- trunk/schema/murrine.xml.in.in	(original)
+++ trunk/schema/murrine.xml.in.in	Sun Dec 28 19:12:29 2008
@@ -51,6 +51,35 @@
 		</enumeration>
 	</option>
 
+	<option type="real" name="glow_ratio" default="1.0">
+		<_long_name>Glow Ratio</_long_name>
+		<_description>Enable and set the Glow Ratio</_description>
+		<section>General</section>
+		<minimum>0</minimum>
+		<maximum>2</maximum>
+		<precision>0.1</precision>
+	</option>
+
+	<option type="enumeration" name="glowstyle" default="0">
+		<_long_name>Glow Style</_long_name>
+		<section>General</section>
+		<enumeration value="0">
+			<label>Top glow</label>
+		</enumeration>
+		<enumeration value="1">
+			<label>Bottom glow</label>
+		</enumeration>
+		<enumeration value="2">
+			<label>Top and Bottom glow</label>
+		</enumeration>
+		<enumeration value="3">
+			<label>Horizontal glow</label>
+		</enumeration>
+		<enumeration value="4">
+			<label>Centered glow</label>
+		</enumeration>
+	</option>
+
 	<option type="real" name="gradient_stop_1" default="1.0">
 		<optional>Enable custom gradients</optional>
 		<_long_name>First gradient stop</_long_name>

Modified: trunk/src/cairo-support.c
==============================================================================
--- trunk/src/cairo-support.c	(original)
+++ trunk/src/cairo-support.c	Sun Dec 28 19:12:29 2008
@@ -528,19 +528,78 @@
 }
 
 static void
-murrine_draw_glow (cairo_t *cr,
-                   const MurrineRGB *glow,
-                   int x, int y, int width, int height)
+murrine_draw_bottom_glow (cairo_t *cr,
+                          const MurrineRGB *glow,
+                          int x, int y, int width, int height)
 {
 	cairo_pattern_t *pat;
 	double           scaling_factor = (double)1.2*width/height;
 
+	cairo_rectangle (cr, x, y, width, height);
 	cairo_save (cr);
+	cairo_scale (cr, scaling_factor, 1);
+	pat = cairo_pattern_create_radial ((x+width/2.0)/scaling_factor, y+height, 0,
+	                                   (x+width/2.0)/scaling_factor, y+height, height/2);
+	murrine_pattern_add_color_stop_rgba (pat, 0.0, glow, 0.5);
+	murrine_pattern_add_color_stop_rgba (pat, 1.0, glow, 0.0);
+	cairo_set_source (cr, pat);
+	cairo_pattern_destroy (pat);
+	cairo_fill (cr);
+	cairo_restore (cr);
+}
+
+static void
+murrine_draw_centered_glow (cairo_t *cr,
+                            const MurrineRGB *glow,
+                            int x, int y, int width, int height)
+{
+	cairo_pattern_t *pat;
+	double           scaling_factor = (double)1.2*width/height;
+
 	cairo_rectangle (cr, x, y, width, height);
+	cairo_save (cr);
+	cairo_scale (cr, scaling_factor, 1);
+	pat = cairo_pattern_create_radial ((x+width/2.0)/scaling_factor, y+height/2, 0,
+	                                   (x+width/2.0)/scaling_factor, y+height/2, height/2);
+	murrine_pattern_add_color_stop_rgba (pat, 0.0, glow, 0.5);
+	murrine_pattern_add_color_stop_rgba (pat, 1.0, glow, 0.0);
+	cairo_set_source (cr, pat);
+	cairo_pattern_destroy (pat);
+	cairo_fill (cr);
+	cairo_restore (cr);
+}
+
+static void
+murrine_draw_horizontal_glow (cairo_t *cr,
+                              const MurrineRGB *glow,
+                              int x, int y, int width, int height)
+{
+	cairo_pattern_t *pat;
+
+	cairo_rectangle (cr, x, y, width, height);
+	pat = cairo_pattern_create_linear (x, y, width, 0);
+	murrine_pattern_add_color_stop_rgba (pat, 0.0, glow, 0.0);
+	murrine_pattern_add_color_stop_rgba (pat, 0.5, glow, 0.5);
+	murrine_pattern_add_color_stop_rgba (pat, 1.0, glow, 0.0);
+	cairo_set_source (cr, pat);
+	cairo_pattern_destroy (pat);
+	cairo_fill (cr);
+}
+
+static void
+murrine_draw_top_glow (cairo_t *cr,
+                       const MurrineRGB *glow,
+                       int x, int y, int width, int height)
+{
+	cairo_pattern_t *pat;
+	double           scaling_factor = (double)1.2*width/height;
+
+	cairo_rectangle (cr, x, y, width, height);
+	cairo_save (cr);
 	cairo_scale (cr, scaling_factor, 1);
-	pat = cairo_pattern_create_radial ((x+width/2.0)/scaling_factor, y, y,
-	                                   (x+width/2.0)/scaling_factor, y, y+height/2);
-	murrine_pattern_add_color_stop_rgba (pat, 0.0, glow, 0.6);
+	pat = cairo_pattern_create_radial ((x+width/2.0)/scaling_factor, y, 0,
+	                                   (x+width/2.0)/scaling_factor, y, height/2);
+	murrine_pattern_add_color_stop_rgba (pat, 0.0, glow, 0.5);
 	murrine_pattern_add_color_stop_rgba (pat, 1.0, glow, 0.0);
 	cairo_set_source (cr, pat);
 	cairo_pattern_destroy (pat);
@@ -609,6 +668,7 @@
 void
 murrine_draw_glaze (cairo_t *cr,
                     const MurrineRGB *fill,
+                    double glow_ratio,
                     double highlight_ratio,
                     double lightborder_ratio,
                     MurrineGradients mrn_gradient,
@@ -617,7 +677,6 @@
                     int radius, uint8 corners, boolean horizontal)
 {
 	MurrineRGB highlight;
-	double glow_ratio = widget->glow_ratio;
 	murrine_shade (fill, highlight_ratio, &highlight);
 
 	murrine_set_gradient (cr, fill, mrn_gradient, x, y, 0, height, mrn_gradient.gradients, FALSE);
@@ -655,7 +714,26 @@
 		MurrineRGB glow;
 		murrine_shade (fill, glow_ratio, &glow);
 
-		murrine_draw_glow (cr, &glow, x, y, width, height);
+		switch (widget->glowstyle)
+		{
+			default:
+			case 0:
+				murrine_draw_top_glow (cr, &glow, x, y, width, height);
+				break;
+			case 1:
+				murrine_draw_bottom_glow (cr, &glow, x, y, width, height);
+				break;
+			case 2:
+				murrine_draw_top_glow (cr, &glow, x, y, width, height);
+				murrine_draw_bottom_glow (cr, &glow, x, y, width, height);
+				break;
+			case 3:
+				murrine_draw_horizontal_glow (cr, &glow, x, y, width, height);
+				break;
+			case 4:
+				murrine_draw_centered_glow (cr, &glow, x, y, width, height);
+				break;
+		}
 	}
 
 	if (widget->glazestyle == 4)

Modified: trunk/src/cairo-support.h
==============================================================================
--- trunk/src/cairo-support.h	(original)
+++ trunk/src/cairo-support.h	Sun Dec 28 19:12:29 2008
@@ -93,6 +93,7 @@
 
 G_GNUC_INTERNAL void murrine_draw_glaze (cairo_t *cr,
                                          const MurrineRGB *fill,
+                                         double glow_ratio,
                                          double highlight_ratio,
                                          double lightborder_ratio,
                                          MurrineGradients mrn_gradient,

Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c	(original)
+++ trunk/src/murrine_draw.c	Sun Dec 28 19:12:29 2008
@@ -194,7 +194,8 @@
 	if (widget->roundness > 1)
 		cairo_clip_preserve (cr);
 
-	murrine_draw_glaze (cr, &fill, highlight_ratio_custom, !widget->active ? widget->lightborder_ratio : 1.0,
+	murrine_draw_glaze (cr, &fill,
+	                    widget->glow_ratio, highlight_ratio_custom, !widget->active ? widget->lightborder_ratio : 1.0,
 	                    mrn_gradient_custom, widget,
 	                    xos+1, yos+1, width-(xos*2)-2, height-(yos*2)-2,
 	                    widget->roundness, widget->corners, horizontal);
@@ -518,7 +519,8 @@
 	cairo_save (cr);
 	cairo_rectangle (cr, 2, 1, width-4, height-2);
 
-	murrine_draw_glaze (cr, fill, widget->highlight_ratio, widget->lightborder_ratio,
+	murrine_draw_glaze (cr, fill,
+	                    widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
 	                    widget->mrn_gradient, widget, 2, 1, width-4, height-2,
 	                    widget->roundness, widget->corners, TRUE);
 
@@ -604,7 +606,8 @@
 		case 1:
 		{
 			int os = (widget->glazestyle == 2) ? 1 : 0;
-			murrine_draw_glaze (cr, fill, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
+			murrine_draw_glaze (cr, fill,
+			                    widget->glow_ratio, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
 			                    widget->mrn_gradient, widget, os, os, width-os*2, height-os*2,
 			                    widget->roundness, widget->corners, TRUE);
 			break;
@@ -699,7 +702,8 @@
 		case 1:
 		{
 			int os = (widget->glazestyle == 2) ? 1 : 0;
-			murrine_draw_glaze (cr, fill, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
+			murrine_draw_glaze (cr, fill,
+			                    widget->glow_ratio, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
 			                    widget->mrn_gradient, widget, os, os, width-os*2, height-os*2,
 			                    widget->roundness, widget->corners, TRUE);
 			break;
@@ -1132,7 +1136,8 @@
 		case 1:
 			cairo_rectangle (cr, 0, 0, width, height);
 
-			murrine_draw_glaze (cr, fill, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
+			murrine_draw_glaze (cr, fill,
+			                    widget->glow_ratio, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
 			                    widget->mrn_gradient, widget, 0, 0, width, height-1,
 			                    widget->roundness, widget->corners, TRUE);
 			break;
@@ -1208,7 +1213,8 @@
 			if (widget->roundness > 1)
 				cairo_clip_preserve (cr);
 
-			murrine_draw_glaze (cr, &colors->spot[1], widget->highlight_ratio, widget->lightborder_ratio,
+			murrine_draw_glaze (cr, &colors->spot[1],
+			                    widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
 			                    widget->mrn_gradient, widget, 1, 1, width-2, height-2,
 			                    widget->roundness, widget->corners, TRUE);
 			break;
@@ -1317,7 +1323,8 @@
 	if (widget->roundness > 1)
 		cairo_clip_preserve(cr);
 
-	murrine_draw_glaze (cr, fill, widget->highlight_ratio, widget->lightborder_ratio,
+	murrine_draw_glaze (cr, fill,
+	                    widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
 	                    widget->mrn_gradient, widget, 1, 1, width-2, height-2,
 	                    widget->roundness, widget->corners, TRUE);
 
@@ -1383,7 +1390,8 @@
 
 	murrine_rounded_rectangle_closed (cr, 1, 1, width-2, height-2, widget->roundness, widget->corners);
 
-	murrine_draw_glaze (cr, &fill, widget->highlight_ratio, widget->lightborder_ratio,
+	murrine_draw_glaze (cr, &fill,
+	                    widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
 	                    widget->mrn_gradient, widget, 1, 1, width-2, height-2,
 	                    widget->roundness, widget->corners, TRUE);
 

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Sun Dec 28 19:12:29 2008
@@ -195,7 +195,8 @@
 	if (widget->roundness > 1)
 		cairo_clip_preserve (cr);
 
-	murrine_draw_glaze (cr, &fill, highlight_ratio_custom, !widget->active ? widget->lightborder_ratio : 1.0,
+	murrine_draw_glaze (cr, &fill,
+	                    widget->glow_ratio, highlight_ratio_custom, !widget->active ? widget->lightborder_ratio : 1.0,
 	                    mrn_gradient_custom, widget, xos+1, yos+1, width-(xos*2)-2, height-(yos*2)-2,
 	                    widget->roundness, widget->corners, horizontal);
 
@@ -474,7 +475,8 @@
 
 	cairo_rectangle (cr, 2, 1, width-4, height-2);
 
-	murrine_draw_glaze (cr, fill, widget->highlight_ratio, widget->lightborder_ratio,
+	murrine_draw_glaze (cr, fill,
+	                    widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
 	                    widget->mrn_gradient, widget, 2, 1, width-4, height-2,
 	                    widget->roundness, widget->corners, TRUE);
 
@@ -550,7 +552,8 @@
 		{
 			/* XXX: should use another gradient rgba_opacity */
 			int os = (widget->glazestyle == 2) ? 1 : 0;
-			murrine_draw_glaze (cr, fill, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
+			murrine_draw_glaze (cr, fill,
+			                    widget->glow_ratio, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
 			                    widget->mrn_gradient, widget, os, os, width-os*2, height-os*2,
 			                    widget->roundness, widget->corners, TRUE);
 			break;
@@ -651,7 +654,8 @@
 		case 1:
 		{
 			int os = (widget->glazestyle == 2) ? 1 : 0;
-			murrine_draw_glaze (cr, fill, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
+			murrine_draw_glaze (cr, fill,
+			                    widget->glow_ratio, widget->highlight_ratio, widget->glazestyle == 2 ? widget->lightborder_ratio : 1.0,
 			                    widget->mrn_gradient, widget, os, os, width-os*2, height-os*2,
 			                    widget->roundness, widget->corners, TRUE);
 
@@ -1114,7 +1118,8 @@
 	if (widget->roundness > 1)
 		cairo_clip_preserve(cr);
 
-	murrine_draw_glaze (cr, fill, widget->highlight_ratio, widget->lightborder_ratio,
+	murrine_draw_glaze (cr, fill,
+	                    widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
 	                    widget->mrn_gradient, widget, 1, 1, width-2, height-2,
 	                    widget->roundness, widget->corners, TRUE);
 
@@ -1182,7 +1187,8 @@
 
 	murrine_rounded_rectangle_closed (cr, 1, 1, width-2, height-2, widget->roundness, widget->corners);
 
-	murrine_draw_glaze (cr, &fill, widget->highlight_ratio, widget->lightborder_ratio,
+	murrine_draw_glaze (cr, &fill,
+	                    widget->glow_ratio, widget->highlight_ratio, widget->lightborder_ratio,
 	                    widget->mrn_gradient, widget, 1, 1, width-2, height-2,
 	                    widget->roundness, widget->corners, TRUE);
 

Modified: trunk/src/murrine_rc_style.c
==============================================================================
--- trunk/src/murrine_rc_style.c	(original)
+++ trunk/src/murrine_rc_style.c	Sun Dec 28 19:12:29 2008
@@ -40,6 +40,7 @@
 	TOKEN_CONTRAST,
 	TOKEN_GLAZESTYLE,
 	TOKEN_GLOW_RATIO,
+	TOKEN_GLOWSTYLE,
 	TOKEN_GRADIENT_SHADES,
 	TOKEN_GRADIENTS,
 	TOKEN_HIGHLIGHT_RATIO,
@@ -88,6 +89,7 @@
 	{ "contrast",            TOKEN_CONTRAST },
 	{ "glazestyle",          TOKEN_GLAZESTYLE },
 	{ "glow_ratio",          TOKEN_GLOW_RATIO },
+	{ "glowstyle",           TOKEN_GLOWSTYLE },
 	{ "gradient_shades",     TOKEN_GRADIENT_SHADES },
 	{ "gradients",           TOKEN_GRADIENTS },
 	{ "highlight_ratio",     TOKEN_HIGHLIGHT_RATIO },
@@ -142,6 +144,7 @@
 	murrine_rc->contrast = 1.0;
 	murrine_rc->glazestyle = 1;
 	murrine_rc->glow_ratio = 1.0;
+	murrine_rc->glowstyle = 0;
 	murrine_rc->gradient_shades[0] = 1.1;
 	murrine_rc->gradient_shades[1] = 1.0;
 	murrine_rc->gradient_shades[2] = 1.0;
@@ -474,6 +477,10 @@
 				token = theme_parse_ratio (settings, scanner, &murrine_style->glow_ratio);
 				murrine_style->flags |= MRN_FLAG_GLOW_RATIO;
 				break;
+			case TOKEN_GLOWSTYLE:
+				token = theme_parse_int (settings, scanner, &murrine_style->glowstyle);
+				murrine_style->flags |= MRN_FLAG_GLOWSTYLE;
+				break;
 			case TOKEN_GRADIENT_SHADES:
 				token = theme_parse_gradient (settings, scanner, murrine_style->gradient_shades);
 				murrine_style->flags |= MRN_FLAG_GRADIENT_SHADES;
@@ -618,6 +625,8 @@
 		dest_w->glazestyle = src_w->glazestyle;
 	if (flags & MRN_FLAG_GLOW_RATIO)
 		dest_w->glow_ratio = src_w->glow_ratio;
+	if (flags & MRN_FLAG_GLOWSTYLE)
+		dest_w->glowstyle = src_w->glowstyle;
 	if (flags & MRN_FLAG_GRADIENT_SHADES)
 	{
 		dest_w->gradient_shades[0] = src_w->gradient_shades[0];

Modified: trunk/src/murrine_rc_style.h
==============================================================================
--- trunk/src/murrine_rc_style.h	(original)
+++ trunk/src/murrine_rc_style.h	Sun Dec 28 19:12:29 2008
@@ -40,27 +40,28 @@
 	MRN_FLAG_CONTRAST = 1 << 2,
 	MRN_FLAG_GLAZESTYLE = 1 << 3,
 	MRN_FLAG_GLOW_RATIO = 1 << 4,
-	MRN_FLAG_GRADIENT_SHADES = 1 << 5,
-	MRN_FLAG_GRADIENTS = 1 << 6,
-	MRN_FLAG_HIGHLIGHT_RATIO = 1 << 7,
-	MRN_FLAG_LIGHTBORDER_RATIO = 1 << 8,
-	MRN_FLAG_LIGHTBORDERSTYLE= 1 << 9,
-	MRN_FLAG_LISTVIEWHEADERSTYLE = 1 << 10,
-	MRN_FLAG_LISTVIEWSTYLE = 1 << 11,
-	MRN_FLAG_MENUBARITEMSTYLE = 1 << 12,
-	MRN_FLAG_MENUBARSTYLE = 1 << 13,
-	MRN_FLAG_MENUITEMSTYLE = 1 << 14,
-	MRN_FLAG_MENUSTYLE = 1 << 15,
-	MRN_FLAG_PROFILE = 1 << 16,
-	MRN_FLAG_PROGRESSBARSTYLE = 1 << 17,
-	MRN_FLAG_RELIEFSTYLE = 1 << 18,
-	MRN_FLAG_RGBA = 1 << 19,
-	MRN_FLAG_ROUNDNESS = 1 << 20,
-	MRN_FLAG_SCROLLBAR_COLOR = 1 << 21,
-	MRN_FLAG_SCROLLBARSTYLE = 1 << 22,
-	MRN_FLAG_SLIDERSTYLE = 1 << 23,
-	MRN_FLAG_STEPPERSTYLE = 1 << 24,
-	MRN_FLAG_TOOLBARSTYLE = 1 << 25
+	MRN_FLAG_GLOWSTYLE = 1 << 5,
+	MRN_FLAG_GRADIENT_SHADES = 1 << 6,
+	MRN_FLAG_GRADIENTS = 1 << 7,
+	MRN_FLAG_HIGHLIGHT_RATIO = 1 << 8,
+	MRN_FLAG_LIGHTBORDER_RATIO = 1 << 9,
+	MRN_FLAG_LIGHTBORDERSTYLE= 1 << 10,
+	MRN_FLAG_LISTVIEWHEADERSTYLE = 1 << 11,
+	MRN_FLAG_LISTVIEWSTYLE = 1 << 12,
+	MRN_FLAG_MENUBARITEMSTYLE = 1 << 13,
+	MRN_FLAG_MENUBARSTYLE = 1 << 14,
+	MRN_FLAG_MENUITEMSTYLE = 1 << 15,
+	MRN_FLAG_MENUSTYLE = 1 << 16,
+	MRN_FLAG_PROFILE = 1 << 17,
+	MRN_FLAG_PROGRESSBARSTYLE = 1 << 18,
+	MRN_FLAG_RELIEFSTYLE = 1 << 19,
+	MRN_FLAG_RGBA = 1 << 20,
+	MRN_FLAG_ROUNDNESS = 1 << 21,
+	MRN_FLAG_SCROLLBAR_COLOR = 1 << 22,
+	MRN_FLAG_SCROLLBARSTYLE = 1 << 23,
+	MRN_FLAG_SLIDERSTYLE = 1 << 24,
+	MRN_FLAG_STEPPERSTYLE = 1 << 25,
+	MRN_FLAG_TOOLBARSTYLE = 1 << 26
 } MurrineRcFlags;
 
 struct _MurrineRcStyle
@@ -76,6 +77,7 @@
 	double   lightborder_ratio;
 
 	guint8   glazestyle;
+	guint8   glowstyle;
 	guint8   lightborderstyle;
 	guint8   listviewheaderstyle;
 	guint8   listviewstyle;

Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c	(original)
+++ trunk/src/murrine_style.c	Sun Dec 28 19:12:29 2008
@@ -138,6 +138,7 @@
 
 	params->glazestyle        = murrine_style->glazestyle;
 	params->glow_ratio        = murrine_style->glow_ratio;
+	params->glowstyle         = murrine_style->glowstyle;
 	params->highlight_ratio   = murrine_style->highlight_ratio;
 	params->lightborder_ratio = murrine_style->lightborder_ratio;
 	params->lightborderstyle  = murrine_style->lightborderstyle;
@@ -1709,6 +1710,7 @@
 		murrine_style->roundness       = MURRINE_RC_STYLE (rc_style)->roundness;
 	murrine_style->animation           = MURRINE_RC_STYLE (rc_style)->animation;
 	murrine_style->colorize_scrollbar  = MURRINE_RC_STYLE (rc_style)->colorize_scrollbar;
+	murrine_style->glowstyle           = MURRINE_RC_STYLE (rc_style)->glowstyle;
 	murrine_style->gradients           = MURRINE_RC_STYLE (rc_style)->gradients;
 	murrine_style->has_scrollbar_color = MURRINE_RC_STYLE (rc_style)->has_scrollbar_color;
 	murrine_style->lightborderstyle    = MURRINE_RC_STYLE (rc_style)->lightborderstyle;
@@ -1960,6 +1962,7 @@
 	mrn_style->colors              = mrn_src->colors;
 	mrn_style->glazestyle          = mrn_src->glazestyle;
 	mrn_style->glow_ratio          = mrn_src->glow_ratio;
+	mrn_style->glowstyle           = mrn_src->glowstyle;
 	mrn_style->gradient_shades[0]  = mrn_src->gradient_shades[0];
 	mrn_style->gradient_shades[1]  = mrn_src->gradient_shades[1];
 	mrn_style->gradient_shades[2]  = mrn_src->gradient_shades[2];

Modified: trunk/src/murrine_style.h
==============================================================================
--- trunk/src/murrine_style.h	(original)
+++ trunk/src/murrine_style.h	Sun Dec 28 19:12:29 2008
@@ -51,6 +51,7 @@
 	double   lightborder_ratio;
 
 	guint8   glazestyle;
+	guint8   glowstyle;
 	guint8   lightborderstyle;
 	guint8   listviewheaderstyle;
 	guint8   listviewstyle;

Modified: trunk/src/murrine_types.h
==============================================================================
--- trunk/src/murrine_types.h	(original)
+++ trunk/src/murrine_types.h	Sun Dec 28 19:12:29 2008
@@ -197,6 +197,7 @@
 
 	/* Style */
 	int glazestyle;
+	int glowstyle;
 	int lightborderstyle;
 	int reliefstyle;
 	int roundness;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]