GNOME.org
 

gtk-css-engine r47 - in branches/bzr: . libccd/ccd themes/gtk-css-test/gtk-2.0

Author: robsta
Date: Fri Sep  5 11:33:03 2008
New Revision: 47
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=47&view=rev

Log:
Split up background-color and -image properties, so they can be applied independently.

Modified:
   branches/bzr/   (props changed)
   branches/bzr/libccd/ccd/ccd-background.c
   branches/bzr/libccd/ccd/ccd-background.h
   branches/bzr/libccd/ccd/ccd-border.c
   branches/bzr/libccd/ccd/ccd-border.h
   branches/bzr/libccd/ccd/ccd-color.c
   branches/bzr/libccd/ccd/ccd-gtk-style.c
   branches/bzr/libccd/ccd/ccd-image.c
   branches/bzr/libccd/ccd/ccd-property.c
   branches/bzr/libccd/ccd/ccd-property.h
   branches/bzr/libccd/ccd/ccd-selector.c
   branches/bzr/libccd/ccd/ccd-style.c
   branches/bzr/libccd/ccd/ccd-style.h
   branches/bzr/themes/gtk-css-test/gtk-2.0/styles.css

Modified: branches/bzr/libccd/ccd/ccd-background.c
==============================================================================
--- branches/bzr/libccd/ccd/ccd-background.c	(original)
+++ branches/bzr/libccd/ccd/ccd-background.c	Fri Sep  5 11:33:03 2008
@@ -39,16 +39,16 @@
 {
 	ccd_property_spec_t spec;
 
-	spec = CCD_PROPERTY_SPEC_UNKNOWN;
+	spec = CCD_PROPERTY_SPEC_UNSET;
 	if (0 == strcmp ("background-color", property)) {
-		spec = ccd_color_parse (&self->color, values);
-		g_return_val_if_fail (spec != CCD_PROPERTY_SPEC_UNKNOWN, false);
-		self->color_spec = spec;
+		spec = ccd_color_parse (&self->bg_color.color, values);
+		g_return_val_if_fail (spec != CCD_PROPERTY_SPEC_UNSET, false);
+		self->bg_color.spec = spec;
 		return true;
 	} else if (0 == strcmp ("background-image", property)) {
-		spec = ccd_image_parse (&self->image, values);
-		g_return_val_if_fail (spec != CCD_PROPERTY_SPEC_UNKNOWN, false);
-		self->image_spec = spec;
+		spec = ccd_image_parse (&self->bg_image.image, values);
+		g_return_val_if_fail (spec != CCD_PROPERTY_SPEC_UNSET, false);
+		self->bg_image.spec = spec;
 		return true;
 	}
 
@@ -56,35 +56,37 @@
 }
 
 void
-ccd_background_draw (ccd_background_t const	*self,
-		     cairo_t			*cr,
-		     int32_t			 x,
-		     int32_t			 y,
-		     int32_t			 width,
-		     int32_t			 height)
+ccd_background_draw (ccd_background_color_t const	*bg_color, 
+		     ccd_background_image_t const	*bg_image,
+		     cairo_t				*cr,
+		     int32_t				 x,
+		     int32_t				 y, 
+		     int32_t				 width,
+		     int32_t				 height)
 {
 	double dx;
 	double dy;
 
-	g_assert (self);
-
 	cairo_save (cr);
 
-	if (self->color_spec != CCD_PROPERTY_SPEC_UNKNOWN) {
+	if (bg_color && bg_color->spec != CCD_PROPERTY_SPEC_UNSET) {
 
-		cairo_set_source_rgb (cr, self->color.red, self->color.green, self->color.blue);
+		cairo_set_source_rgb (cr, bg_color->color.red, 
+					  bg_color->color.green, 
+					  bg_color->color.blue);
 		cairo_rectangle (cr, x, y, width, height);
 		cairo_fill (cr);
 	}
 
-	if (self->image_spec != CCD_PROPERTY_SPEC_UNKNOWN) {
+	if (bg_image && bg_image->spec != CCD_PROPERTY_SPEC_UNSET) {
 		dx = (double) width / 
-		     cairo_image_surface_get_width (self->image.surface);
+		     cairo_image_surface_get_width (bg_image->image.surface);
 		dy = (double) height /
-		     cairo_image_surface_get_height (self->image.surface);
+		     cairo_image_surface_get_height (bg_image->image.surface);
 		cairo_scale (cr, dx, dy);
 
-		cairo_set_source_surface (cr, self->image.surface, x / dx, y / dy);
+		cairo_set_source_surface (cr, bg_image->image.surface,
+					  x / dx, y / dy);
 		cairo_rectangle (cr, x / dx, y / dy, width / dx, height / dy);
 		cairo_fill (cr);
 	}
@@ -96,21 +98,45 @@
 ccd_background_dump (ccd_background_t const *self)
 {
 	printf ("    background-color: ");
-	switch (self->color_spec) {
+	ccd_background_color_dump (&self->bg_color);
+	printf (";\n");
+
+	printf ("    background-image: ");
+	ccd_background_image_dump (&self->bg_image);
+	printf (";\n");
+}
+
+void
+ccd_background_color_dump (ccd_background_color_t const *self)
+{
+	switch (self->spec) {
+	case CCD_PROPERTY_SPEC_UNSET:
 	case CCD_PROPERTY_SPEC_NONE:
-		printf ("none");
+		ccd_property_spec_dump (self->spec);
 		break;
 	case CCD_PROPERTY_SPEC_INHERIT:
-		printf ("inherit");
-		break;
+		ccd_property_spec_dump (self->spec);
+		/* fall thru */
 	case CCD_PROPERTY_SPEC_SET:
 		ccd_color_dump (&self->color);
 		break;
-	case CCD_PROPERTY_SPEC_UNKNOWN:
-		/* fall thru */
-		;
 	}
+}
 
-	printf (";\n");
+void
+ccd_background_image_dump (ccd_background_image_t const *self)
+{
+	switch (self->spec) {
+	case CCD_PROPERTY_SPEC_UNSET:
+	case CCD_PROPERTY_SPEC_NONE:
+		ccd_property_spec_dump (self->spec);
+		break;
+	case CCD_PROPERTY_SPEC_INHERIT:
+		ccd_property_spec_dump (self->spec);
+		/* fall thru */
+	case CCD_PROPERTY_SPEC_SET:
+		ccd_image_dump (&self->image);
+		break;
+	}
 }
 

Modified: branches/bzr/libccd/ccd/ccd-background.h
==============================================================================
--- branches/bzr/libccd/ccd/ccd-background.h	(original)
+++ branches/bzr/libccd/ccd/ccd-background.h	Fri Sep  5 11:33:03 2008
@@ -34,9 +34,17 @@
 
 typedef struct {
 	ccd_color_t		color;
-	ccd_property_spec_t	color_spec;
+	ccd_property_spec_t	spec;
+} ccd_background_color_t;
+
+typedef struct {
 	ccd_image_t		image;
-	ccd_property_spec_t	image_spec;
+	ccd_property_spec_t	spec;
+} ccd_background_image_t;
+
+typedef struct {
+	ccd_background_color_t	bg_color;
+	ccd_background_image_t	bg_image;
 } ccd_background_t;
 
 ccd_background_t *	ccd_background_new	(void);
@@ -45,10 +53,14 @@
 bool ccd_background_parse (ccd_background_t *self, char const *property, 
 			   CRTerm const *values);
 
-void ccd_background_draw (ccd_background_t const *self, cairo_t *cr, 
-			  int32_t x, int32_t y, int32_t width, int32_t height);
-
-void ccd_background_dump (ccd_background_t const *self);
+void ccd_background_draw (ccd_background_color_t const *bg_color, 
+			  ccd_background_image_t const *bg_image,
+			  cairo_t *cr, int32_t x, int32_t y, 
+			  int32_t width, int32_t height);
+
+void ccd_background_dump	(ccd_background_t const *self);
+void ccd_background_color_dump	(ccd_background_color_t const *self);
+void ccd_background_image_dump	(ccd_background_image_t const *self);
 
 G_END_DECLS
 

Modified: branches/bzr/libccd/ccd/ccd-border.c
==============================================================================
--- branches/bzr/libccd/ccd/ccd-border.c	(original)
+++ branches/bzr/libccd/ccd/ccd-border.c	Fri Sep  5 11:33:03 2008
@@ -28,7 +28,7 @@
 	border_.width = val_;							\
 	border_.flags |= CCD_BORDER_FLAGS_COMMON_WIDTH;				\
 }										\
-if (spec_ != CCD_PROPERTY_SPEC_UNKNOWN) {					\
+if (spec_ != CCD_PROPERTY_SPEC_UNSET) {						\
 	border_.width_spec = spec_;						\
 }
 
@@ -37,7 +37,7 @@
 	border_.width = val_;							\
 	border_.flags |= CCD_BORDER_FLAGS_SPECIFIC_WIDTH;			\
 }										\
-if (spec_ != CCD_PROPERTY_SPEC_UNKNOWN) {					\
+if (spec_ != CCD_PROPERTY_SPEC_UNSET) {						\
 	border_.width_spec = spec_;						\
 }
 
@@ -47,7 +47,7 @@
 	border_.style = val_;							\
 	border_.flags |= CCD_BORDER_FLAGS_COMMON_STYLE;				\
 }										\
-if (spec_ != CCD_PROPERTY_SPEC_UNKNOWN) {					\
+if (spec_ != CCD_PROPERTY_SPEC_UNSET) {						\
 	border_.style_spec = spec_;						\
 }
 
@@ -56,7 +56,7 @@
 	border_.style = val_;							\
 	border_.flags |= CCD_BORDER_FLAGS_SPECIFIC_STYLE;			\
 }										\
-if (spec_ != CCD_PROPERTY_SPEC_UNKNOWN) {					\
+if (spec_ != CCD_PROPERTY_SPEC_UNSET) {						\
 	border_.style_spec = spec_;						\
 }
 
@@ -68,7 +68,7 @@
 	border_.color.blue = val_.blue;						\
 	border_.flags |= CCD_BORDER_FLAGS_COMMON_COLOR;				\
 }										\
-if (spec_ != CCD_PROPERTY_SPEC_UNKNOWN) {					\
+if (spec_ != CCD_PROPERTY_SPEC_UNSET) {						\
 	border_.color_spec = spec_;						\
 }
 
@@ -79,7 +79,7 @@
 	border_.color.blue = val_.blue;						\
 	border_.flags |= CCD_BORDER_FLAGS_SPECIFIC_COLOR;			\
 }										\
-if (spec_ != CCD_PROPERTY_SPEC_UNKNOWN) {					\
+if (spec_ != CCD_PROPERTY_SPEC_UNSET) {						\
 	border_.color_spec = spec_;						\
 }
 
@@ -168,7 +168,7 @@
 
 	width = 0;	/* prevent warning */
 	width_spec = ccd_property_parse_spec (iter);
-	if (CCD_PROPERTY_SPEC_UNKNOWN == width_spec &&
+	if (CCD_PROPERTY_SPEC_SET == width_spec &&
 	    iter && 
 	    TERM_NUMBER == iter->type) {
 		/* width */
@@ -179,7 +179,7 @@
 
 	style_spec = ccd_property_parse_spec (iter);
 	style = CCD_BORDER_STYLE_SOLID;	/* prevent warning */
-	if (CCD_PROPERTY_SPEC_UNKNOWN == style_spec &&
+	if (CCD_PROPERTY_SPEC_SET == style_spec &&
 	    iter && 
 	    TERM_IDENT == iter->type &&
 	    match_style (cr_string_peek_raw_str (iter->content.str), &style)) {
@@ -190,7 +190,7 @@
 
 	color_spec = ccd_property_parse_spec (iter);
 	color.red = color.green = color.blue = 0; /* prevent warning */
-	if (CCD_PROPERTY_SPEC_UNKNOWN == color_spec &&
+	if (CCD_PROPERTY_SPEC_SET == color_spec &&
 	    iter &&
 	    ccd_color_parse (&color, iter)) {
 		/* color */
@@ -402,18 +402,18 @@
 }
 
 void
-ccd_border_dump_stroke (ccd_border_stroke_t const *stroke)
+ccd_border_stroke_dump (ccd_border_stroke_t const *self)
 {
-	if (stroke->flags & CCD_BORDER_FLAGS_WIDTH_MASK) {
-		printf ("%.1f ", stroke->width);
+	if (self->flags & CCD_BORDER_FLAGS_WIDTH_MASK) {
+		printf ("%.1f ", self->width);
 	}
 
-	if (stroke->flags & CCD_BORDER_FLAGS_STYLE_MASK) {
-		printf ("%s ", lookup_name (stroke->style));
+	if (self->flags & CCD_BORDER_FLAGS_STYLE_MASK) {
+		printf ("%s ", lookup_name (self->style));
 	}
 
-	if (stroke->flags & CCD_BORDER_FLAGS_COLOR_MASK) {
-		ccd_color_dump (&stroke->color);
+	if (self->flags & CCD_BORDER_FLAGS_COLOR_MASK) {
+		ccd_color_dump (&self->color);
 	}
 
 	printf (";\n");
@@ -424,22 +424,22 @@
 {
 	if (self->left.flags) {
 		printf (CCD_PROPERTY_DUMP_PREFIX "border-left: ");
-		ccd_border_dump_stroke (&self->left);
+		ccd_border_stroke_dump (&self->left);
 	}
 
 	if (self->top.flags) {
 		printf (CCD_PROPERTY_DUMP_PREFIX "border-top: ");
-		ccd_border_dump_stroke (&self->top);
+		ccd_border_stroke_dump (&self->top);
 	}
 
 	if (self->right.flags) {
 		printf (CCD_PROPERTY_DUMP_PREFIX "border-right: ");
-		ccd_border_dump_stroke (&self->right);
+		ccd_border_stroke_dump (&self->right);
 	}
 
 	if (self->bottom.flags) {
 		printf (CCD_PROPERTY_DUMP_PREFIX "border-bottom: ");
-		ccd_border_dump_stroke (&self->bottom);
+		ccd_border_stroke_dump (&self->bottom);
 	}
 }
 

Modified: branches/bzr/libccd/ccd/ccd-border.h
==============================================================================
--- branches/bzr/libccd/ccd/ccd-border.h	(original)
+++ branches/bzr/libccd/ccd/ccd-border.h	Fri Sep  5 11:33:03 2008
@@ -90,7 +90,7 @@
 		      cairo_t *cr, double x, double y, double width, double height);
 
 void ccd_border_dump		(ccd_border_t const *self);
-void ccd_border_dump_stroke	(ccd_border_stroke_t const *stroke);
+void ccd_border_stroke_dump	(ccd_border_stroke_t const *self);
 
 G_END_DECLS
 

Modified: branches/bzr/libccd/ccd/ccd-color.c
==============================================================================
--- branches/bzr/libccd/ccd/ccd-color.c	(original)
+++ branches/bzr/libccd/ccd/ccd-color.c	Fri Sep  5 11:33:03 2008
@@ -256,30 +256,26 @@
 ccd_color_parse (ccd_color_t	*self,
 		 CRTerm	const	*value)
 {
-	ccd_property_spec_t	type;
-	bool			ret;
+	ccd_property_spec_t	 type;
+	char const		*str;
 
 	g_return_val_if_fail (self && value, false);
 
 	switch (value->type) {
 	case TERM_IDENT:
 		type = ccd_property_parse_spec (value);
-		if (type != CCD_PROPERTY_SPEC_UNKNOWN) {
+		if (type != CCD_PROPERTY_SPEC_SET) {
 			return type;
 		}
-		ret = ccd_color_parse_name (
-			cr_string_peek_raw_str (value->content.str), self);
-		if (ret)
-			return CCD_PROPERTY_SPEC_SET;
-		else
-		      return CCD_PROPERTY_SPEC_UNKNOWN;
+		str = cr_string_peek_raw_str (value->content.str);
+		return ccd_color_parse_name (str, self) ?
+			CCD_PROPERTY_SPEC_SET :
+			CCD_PROPERTY_SPEC_UNSET;
 	case TERM_HASH:
-		ret = ccd_color_parse_hex (
-			cr_string_peek_raw_str (value->content.str), self);
-		if (ret)
-			return CCD_PROPERTY_SPEC_SET;
-		else
-		      return CCD_PROPERTY_SPEC_UNKNOWN;
+		str = cr_string_peek_raw_str (value->content.str);
+		return ccd_color_parse_hex (str, self) ?
+			CCD_PROPERTY_SPEC_SET :
+			CCD_PROPERTY_SPEC_UNSET;
 	case TERM_RGB:
 		self->red = value->content.rgb->red;
 		self->green = value->content.rgb->green;
@@ -293,7 +289,7 @@
 	case TERM_URI:
 	case TERM_UNICODERANGE:
 	default:
-		return CCD_PROPERTY_SPEC_UNKNOWN;
+		return CCD_PROPERTY_SPEC_UNSET;
 	}
 }
 

Modified: branches/bzr/libccd/ccd/ccd-gtk-style.c
==============================================================================
--- branches/bzr/libccd/ccd/ccd-gtk-style.c	(original)
+++ branches/bzr/libccd/ccd/ccd-gtk-style.c	Fri Sep  5 11:33:03 2008
@@ -44,9 +44,8 @@
 		    int32_t		 gap_start,
 		    int32_t		 gap_width)
 {
-	if (self->background) {
-		ccd_background_draw (self->background, cr, x, y, width, height);
-	}
+	ccd_background_draw (self->bg_color, self->bg_image,
+			     cr, x, y, width, height);
 
 	switch (gap_side) {
 	case GTK_POS_LEFT:

Modified: branches/bzr/libccd/ccd/ccd-image.c
==============================================================================
--- branches/bzr/libccd/ccd/ccd-image.c	(original)
+++ branches/bzr/libccd/ccd/ccd-image.c	Fri Sep  5 11:33:03 2008
@@ -27,6 +27,7 @@
 
 #if CCD_WITH_RSVG
 #include <librsvg/rsvg.h>
+#include <librsvg/rsvg-cairo.h>
 #endif
 
 void
@@ -116,7 +117,6 @@
 load_image (ccd_image_t *self)
 {
 	char	*basename;
-	char	*suffix;
 	char	*id;
 	bool	 matched;
 
@@ -147,38 +147,24 @@
 ccd_image_parse (ccd_image_t	*self,
 		 CRTerm const	*value)
 {
-	bool ret;
+	ccd_property_spec_t	spec;
 
 	switch (value->type) {
 	case TERM_IDENT:
-		if (0 == strcmp ("none", 
-				 cr_string_peek_raw_str (value->content.str))) {
-			self->uri = g_strdup ("none");
-			return CCD_PROPERTY_SPEC_NONE;
-		} else if (0 == strcmp ("inherit", 
-				 cr_string_peek_raw_str (value->content.str))) {
-			self->uri = g_strdup ("inherit");
-			return CCD_PROPERTY_SPEC_INHERIT;
-		} else {
-			return CCD_PROPERTY_SPEC_UNKNOWN;
-		}
-		break;
+		return ccd_property_parse_spec (value);
 	case TERM_URI:
 		self->uri = ccd_function_invoke ("url", value);
-		ret = load_image (self);
-		if (ret)
-			return CCD_PROPERTY_SPEC_SET;
-		else
-		      return CCD_PROPERTY_SPEC_UNKNOWN;
-		break;
+		return load_image (self) ? 
+			CCD_PROPERTY_SPEC_SET :
+			CCD_PROPERTY_SPEC_UNSET;
 	default:
-		return CCD_PROPERTY_SPEC_UNKNOWN;
+		return CCD_PROPERTY_SPEC_UNSET;
 	}
 }
 
 void
 ccd_image_dump (ccd_image_t const *self)
 {
-	printf ("%s", self->uri);
+	printf (self->uri);
 }
 

Modified: branches/bzr/libccd/ccd/ccd-property.c
==============================================================================
--- branches/bzr/libccd/ccd/ccd-property.c	(original)
+++ branches/bzr/libccd/ccd/ccd-property.c	Fri Sep  5 11:33:03 2008
@@ -17,6 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <stdio.h>
 #include <string.h>
 #include "ccd-property.h"
 
@@ -25,8 +26,9 @@
 {
 	char const *str;
 
-	if (value &&
-	    TERM_IDENT == value->type) {
+	if (!value) {
+		return CCD_PROPERTY_SPEC_UNSET;
+	} else if (TERM_IDENT == value->type) {
 		str = cr_string_peek_raw_str (value->content.str);
 		if (0 == strcmp ("none", str)) {
 			return CCD_PROPERTY_SPEC_NONE;
@@ -36,6 +38,25 @@
 		}
 	}
 
-	return CCD_PROPERTY_SPEC_UNKNOWN;
+	return CCD_PROPERTY_SPEC_SET;
+}
+
+void
+ccd_property_spec_dump (ccd_property_spec_t const spec)
+{
+	switch (spec) {
+	case CCD_PROPERTY_SPEC_UNSET:
+		printf ("<unset>");
+		break;
+	case CCD_PROPERTY_SPEC_NONE:
+		printf ("none");
+		break;
+	case CCD_PROPERTY_SPEC_INHERIT:
+		printf ("<inherit>");
+		break;
+	case CCD_PROPERTY_SPEC_SET:
+		/* Needs custom printing. */
+		break;
+	}
 }
 

Modified: branches/bzr/libccd/ccd/ccd-property.h
==============================================================================
--- branches/bzr/libccd/ccd/ccd-property.h	(original)
+++ branches/bzr/libccd/ccd/ccd-property.h	Fri Sep  5 11:33:03 2008
@@ -27,7 +27,7 @@
 G_BEGIN_DECLS
 
 typedef enum {
-	CCD_PROPERTY_SPEC_UNKNOWN = 0,
+	CCD_PROPERTY_SPEC_UNSET = 0,
 	CCD_PROPERTY_SPEC_NONE,
 	CCD_PROPERTY_SPEC_INHERIT,
 	CCD_PROPERTY_SPEC_SET
@@ -35,6 +35,8 @@
 
 ccd_property_spec_t ccd_property_parse_spec (CRTerm const *value);
 
+void ccd_property_spec_dump (ccd_property_spec_t const spec);
+
 G_END_DECLS
 
 #endif /* CCD_PROPERTY_H */

Modified: branches/bzr/libccd/ccd/ccd-selector.c
==============================================================================
--- branches/bzr/libccd/ccd/ccd-selector.c	(original)
+++ branches/bzr/libccd/ccd/ccd-selector.c	Fri Sep  5 11:33:03 2008
@@ -825,16 +825,13 @@
 {
 	g_return_val_if_fail (self && self->block && style, false);
 
-	/* TODO: probably need to split up background-color and -image
-	 * so they can be merged separately from different selectors. */
-
-	switch (self->block->background.color_spec) {
-	case CCD_PROPERTY_SPEC_UNKNOWN:
+	switch (self->block->background.bg_color.spec) {
+	case CCD_PROPERTY_SPEC_UNSET:
 		/* do nothing */
 		break;
 	case CCD_PROPERTY_SPEC_NONE:
 		/* reset */
-		style->background = NULL;
+		style->bg_color = NULL;
 		break;
 	case CCD_PROPERTY_SPEC_INHERIT:
 		/* not implemented */
@@ -842,17 +839,17 @@
 		break;
 	case CCD_PROPERTY_SPEC_SET:
 		/* use */
-		style->background = &self->block->background;
+		style->bg_color = &self->block->background.bg_color;
 		break;
 	}
 
-	switch (self->block->background.image_spec) {
-	case CCD_PROPERTY_SPEC_UNKNOWN:
+	switch (self->block->background.bg_image.spec) {
+	case CCD_PROPERTY_SPEC_UNSET:
 		/* do nothing */
 		break;
 	case CCD_PROPERTY_SPEC_NONE:
 		/* reset */
-		style->background = NULL;
+		style->bg_image = NULL;
 		break;
 	case CCD_PROPERTY_SPEC_INHERIT:
 		/* not implemented */
@@ -860,7 +857,7 @@
 		break;
 	case CCD_PROPERTY_SPEC_SET:
 		/* use */
-		style->background = &self->block->background;
+		style->bg_image = &self->block->background.bg_image;
 		break;
 	}
 

Modified: branches/bzr/libccd/ccd/ccd-style.c
==============================================================================
--- branches/bzr/libccd/ccd/ccd-style.c	(original)
+++ branches/bzr/libccd/ccd/ccd-style.c	Fri Sep  5 11:33:03 2008
@@ -118,11 +118,11 @@
 			  int32_t		 width,
 			  int32_t		 height)
 {
-	if (self->background) {
-		ccd_background_draw (self->background, cr, x, y, width, height);
-	}
+	ccd_background_draw (self->bg_color, self->bg_image,
+			     cr, x, y, width, height);
+
 	ccd_border_draw (self->left, self->top, self->right, self->bottom, 
-				cr, x, y, width, height);
+			 cr, x, y, width, height);
 }
 
 /**
@@ -134,15 +134,17 @@
 void
 ccd_style_dump (ccd_style_t const *self)
 {
-	if (self->background)
-		ccd_background_dump (self->background);
+	if (self->bg_color)
+		ccd_background_color_dump (self->bg_color);
+	if (self->bg_image)
+		ccd_background_image_dump (self->bg_image);
 	if (self->left)
-		ccd_border_dump_stroke (self->left);
+		ccd_border_stroke_dump (self->left);
 	if (self->top)
-		ccd_border_dump_stroke (self->top);
+		ccd_border_stroke_dump (self->top);
 	if (self->right)
-		ccd_border_dump_stroke (self->right);
+		ccd_border_stroke_dump (self->right);
 	if (self->bottom)
-		ccd_border_dump_stroke (self->bottom);
+		ccd_border_stroke_dump (self->bottom);
 }
 

Modified: branches/bzr/libccd/ccd/ccd-style.h
==============================================================================
--- branches/bzr/libccd/ccd/ccd-style.h	(original)
+++ branches/bzr/libccd/ccd/ccd-style.h	Fri Sep  5 11:33:03 2008
@@ -39,7 +39,8 @@
  **/
 typedef struct {
 	/*< private >*/
-	ccd_background_t const		*background;
+	ccd_background_color_t const	*bg_color;
+	ccd_background_image_t const	*bg_image;
 	ccd_border_stroke_t const	*left;
 	ccd_border_stroke_t const	*top;
 	ccd_border_stroke_t const	*right;

Modified: branches/bzr/themes/gtk-css-test/gtk-2.0/styles.css
==============================================================================
--- branches/bzr/themes/gtk-css-test/gtk-2.0/styles.css	(original)
+++ branches/bzr/themes/gtk-css-test/gtk-2.0/styles.css	Fri Sep  5 11:33:03 2008
@@ -80,10 +80,12 @@
 check {
 	background-color: green;
 }
+
 box {
 	background-color: darkkhaki;
 	border: 1px solid black;
 }
+
 flatbox {
 	background-color: darkkhaki;
 	border: 1px solid black;
@@ -130,6 +132,14 @@
 	border-bottom: 2px solid blue;
 }
 
+hline {
+	border: 1px dotted black;
+}
+
+vline {
+	border: 1px dotted black;
+}
+
 GtkMenuBar {
 	border-bottom: none;
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]