diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-10-03 02:47:49 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-10-03 02:47:49 +0000 |
| commit | 86eb3ab06320504b3e13cebcfecced09b219aef3 (patch) | |
| tree | 286f8bcd7da46159332a5185ab60e6727c71644c | |
| parent | 45433d90785c5f0925cafc027659d27124ff0d06 (diff) | |
| download | pango-86eb3ab06320504b3e13cebcfecced09b219aef3.tar.gz | |
unset all part colors, since when drawing just a glyph string,
2005-09-09 Owen Taylor <otaylor@redhat.com>
* pango/pangocairo-render.c (pango_cairo_show_glyph_string): unset
all part colors, since when drawing just a glyph string,
prepare_run() isn't called. (#315599, Choe Hwanjin)
* pango/pango-renderer.c (pango_renderer_draw_layout_line): NULL
out renderer->priv->line_state.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | pango/pango-renderer.c | 3 | ||||
| -rw-r--r-- | pango/pangocairo-render.c | 9 |
3 files changed, 21 insertions, 2 deletions
@@ -1,4 +1,13 @@ -2005-09-22 Tor Lillqvist <tml@novell.com> +2005-09-09 Owen Taylor <otaylor@redhat.com> + + * pango/pangocairo-render.c (pango_cairo_show_glyph_string): unset + all part colors, since when drawing just a glyph string, + prepare_run() isn't called. (#315599, Choe Hwanjin) + + * pango/pango-renderer.c (pango_renderer_draw_layout_line): NULL + out renderer->priv->line_state. + +005-09-22 Tor Lillqvist <tml@novell.com> * pango/pangocairo-win32font.c (_pango_cairo_win32_font_new): Move the calculation of dpi and size earlier. Use the size variable diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c index 6a4ba3c6..346d435a 100644 --- a/pango/pango-renderer.c +++ b/pango/pango-renderer.c @@ -564,8 +564,9 @@ pango_renderer_draw_layout_line (PangoRenderer *renderer, draw_underline (renderer, &state); draw_strikethrough (renderer, &state); + renderer->priv->line_state = NULL; + pango_renderer_deactivate (renderer); - } /** diff --git a/pango/pangocairo-render.c b/pango/pangocairo-render.c index 59121f11..ea0a800e 100644 --- a/pango/pangocairo-render.c +++ b/pango/pangocairo-render.c @@ -304,7 +304,16 @@ pango_cairo_show_glyph_string (cairo_t *cr, crenderer->do_path = FALSE; cairo_get_current_point (cr, &crenderer->x_offset, &crenderer->y_offset); + pango_renderer_activate (renderer); + + pango_renderer_set_color (renderer, PANGO_RENDER_PART_FOREGROUND, NULL); + pango_renderer_set_color (renderer, PANGO_RENDER_PART_BACKGROUND, NULL); + pango_renderer_set_color (renderer, PANGO_RENDER_PART_UNDERLINE, NULL); + pango_renderer_set_color (renderer, PANGO_RENDER_PART_STRIKETHROUGH, NULL); + pango_renderer_draw_glyphs (renderer, font, glyphs, 0, 0); + + pango_renderer_deactivate (renderer); crenderer->cr = NULL; crenderer->x_offset = 0.; |