diff options
| author | Robert Staudinger <robsta@gnome.org> | 2008-12-09 16:17:52 +0100 |
|---|---|---|
| committer | Robert Staudinger <robsta@gnome.org> | 2008-12-09 16:17:52 +0100 |
| commit | 2c9a7e5e3a57a52d10540092b91f4f3021d847c6 (patch) | |
| tree | a459ba11fee1c10d98be406df398f851238fc167 /ccss-cairo/ccss-cairo-style.c | |
| parent | f3fddd34e54b7b7905a6ca1c0bafa5bc29cfae5b (diff) | |
* ccss-cairo/Makefile.am:
* ccss-cairo/ccss-cairo-color-priv.h:
* ccss-cairo/ccss-background-parser.c (background_factory):
* ccss-cairo/ccss-background.c (ccss_background_fill):
* ccss-cairo/ccss-background.h:
* ccss-cairo/ccss-border-parser.c (border_color_factory),
(border_factory_impl):
* ccss-cairo/ccss-border.h:
* ccss-cairo/ccss-cairo-color.c (parse_name), (hex), (parse_hex),
(ccss_cairo_color_parse), (ccss_cairo_color_create),
(ccss_cairo_color_destroy), (ccss_cairo_color_convert),
(peek_property_class), (ccss_cairo_color_get_ptable):
* ccss-cairo/ccss-cairo-color.h:
* ccss-cairo/ccss-cairo-grammar.c (ccss_cairo_grammar_create):
* ccss-cairo/ccss-cairo-style.c (ccss_cairo_style_draw_line),
(gather_stroke), (gather_background),
(ccss_cairo_style_draw_rectangle),
(ccss_cairo_style_draw_rectangle_with_gap):
* ccss-cairo/ccss-cairo.h:
* ccss-cairo/ccss-color.c:
* ccss-cairo/ccss-color.h:
Split out public ccss-cairo-color.h.
* ccss-gtk/ccss-gtk-grammar.c (parse_gboolean), (parse_gchararray),
(parse_gfloat), (parse_gint), (parse_guchar), (parse_gdk_color),
(parse_gtk_border), (parse_gtk_relief_style),
(parse_gtk_requisition), (parse_gtk_shadow_type),
(parse_gtk_toolbar_space_style), (parse_gtk_style_property),
(property_destroy), (property_factory), (peek_property_class),
(ccss_gtk_grammar_create):
* ccss-gtk/ccss-gtk-grammar.h:
Work towards parsing gtk style properties.
Diffstat (limited to 'ccss-cairo/ccss-cairo-style.c')
| -rw-r--r-- | ccss-cairo/ccss-cairo-style.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ccss-cairo/ccss-cairo-style.c b/ccss-cairo/ccss-cairo-style.c index 169999a..cb46a41 100644 --- a/ccss-cairo/ccss-cairo-style.c +++ b/ccss-cairo/ccss-cairo-style.c @@ -123,7 +123,7 @@ ccss_cairo_style_draw_line (ccss_style_t const *self, ccss_border_stroke_t stroke; double off; - stroke.color = (ccss_color_t *) lookup_property_r (self, + stroke.color = (ccss_cairo_color_t *) lookup_property_r (self, CCSS_PROPERTY_BORDER_COLOR); if (NULL == stroke.color) { stroke.color = NULL; @@ -161,14 +161,14 @@ ccss_cairo_style_draw_line (ccss_style_t const *self, static void gather_stroke (ccss_style_t const *self, GQuark color_prop, - ccss_color_t const *color_fallback, + ccss_cairo_color_t const *color_fallback, GQuark style_prop, ccss_border_style_t const *style_fallback, GQuark width_prop, ccss_border_width_t const *width_fallback, ccss_border_stroke_t *stroke) { - stroke->color = (ccss_color_t *) lookup_property_r (self, color_prop); + stroke->color = (ccss_cairo_color_t *) lookup_property_r (self, color_prop); if (NULL == stroke->color) { stroke->color = color_fallback; } @@ -251,7 +251,7 @@ gather_outline (ccss_style_t const *self, static void gather_background (ccss_style_t const *self, ccss_background_attachment_t const **bg_attachment, - ccss_color_t const **bg_color, + ccss_cairo_color_t const **bg_color, ccss_background_image_t const **bg_image, ccss_background_position_t const **bg_position, ccss_background_repeat_t const **bg_repeat, @@ -264,7 +264,7 @@ gather_background (ccss_style_t const *self, if (!*bg_attachment) *bg_attachment = NULL; - *bg_color = (ccss_color_t const *) + *bg_color = (ccss_cairo_color_t const *) g_hash_table_lookup ( self->properties, (gpointer) CCSS_PROPERTY_BACKGROUND_COLOR); @@ -364,7 +364,7 @@ ccss_cairo_style_draw_rectangle (ccss_style_t const *self, ccss_border_image_t const *border_image; ccss_background_attachment_t const *bg_attachment; - ccss_color_t const *bg_color; + ccss_cairo_color_t const *bg_color; ccss_background_image_t const *bg_image; ccss_background_position_t const *bg_position; ccss_background_repeat_t const *bg_repeat; @@ -458,7 +458,7 @@ ccss_cairo_style_draw_rectangle_with_gap (ccss_style_t const *self, ccss_border_join_t const *tr; ccss_background_attachment_t const *bg_attachment; - ccss_color_t const *bg_color; + ccss_cairo_color_t const *bg_color; ccss_background_image_t const *bg_image; ccss_background_position_t const *bg_position; ccss_background_repeat_t const *bg_repeat; |