diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-11-23 15:42:44 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-11-23 15:42:44 +0000 |
| commit | db50679d56c8ded8a23f239b24a8cd9f1f2061c2 (patch) | |
| tree | 8c7bc025eff030673c83214ecd410bf092ff3ceb /pango/pango-attributes.h | |
| parent | a0bbc6ef8b7dc902f20a2655cc54082e6acdca84 (diff) | |
| download | pango-db50679d56c8ded8a23f239b24a8cd9f1f2061c2.tar.gz | |
Add underline_color and strikethrough_color attribute types. (#147616,
Tue Nov 23 10:23:43 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-attributes.[ch]: Add underline_color
and strikethrough_color attribute types. (#147616, Morten
Welinder)
* pango/pango-markup.c docs/pango_markup.sgml: Add
corresponding 'underline_color' and
'strikethrough_color' attributes for <span>.
* pango/pango-renderer.c (pango_renderer_default_prepare_run):
Implement underline and strikethrough colors.
* pango/pango-renderer.c: Fix some bigs with updating
underlines/strikethrough state.
* pango/pango-renderer.c (get_total_matrix): Fix a const
warning.
* docs/pango-sections.txt: Update
Diffstat (limited to 'pango/pango-attributes.h')
| -rw-r--r-- | pango/pango-attributes.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h index 643d15e8..69b63187 100644 --- a/pango/pango-attributes.h +++ b/pango/pango-attributes.h @@ -82,7 +82,9 @@ typedef enum PANGO_ATTR_SHAPE, /* PangoAttrShape */ PANGO_ATTR_SCALE, /* PangoAttrFloat */ PANGO_ATTR_FALLBACK, /* PangoAttrInt */ - PANGO_ATTR_LETTER_SPACING /* PangoAttrInt */ + PANGO_ATTR_LETTER_SPACING, /* PangoAttrInt */ + PANGO_ATTR_UNDERLINE_COLOR, /* PangoAttrColor */ + PANGO_ATTR_STRIKETHROUGH_COLOR /* PangoAttrColor */ } PangoAttrType; typedef enum { @@ -182,8 +184,16 @@ PangoAttribute *pango_attr_weight_new (PangoWeight weight PangoAttribute *pango_attr_variant_new (PangoVariant variant); PangoAttribute *pango_attr_stretch_new (PangoStretch stretch); PangoAttribute *pango_attr_font_desc_new (const PangoFontDescription *desc); -PangoAttribute *pango_attr_underline_new (PangoUnderline underline); -PangoAttribute *pango_attr_strikethrough_new (gboolean strikethrough); + +PangoAttribute *pango_attr_underline_new (PangoUnderline underline); +PangoAttribute *pango_attr_underline_color_new (guint16 red, + guint16 green, + guint16 blue); +PangoAttribute *pango_attr_strikethrough_new (gboolean strikethrough); +PangoAttribute *pango_attr_strikethrough_color_new (guint16 red, + guint16 green, + guint16 blue); + PangoAttribute *pango_attr_rise_new (int rise); PangoAttribute *pango_attr_scale_new (double scale_factor); PangoAttribute *pango_attr_fallback_new (gboolean enable_fallback); |