diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-07-25 19:30:11 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-07-25 19:30:11 +0000 |
| commit | 6a100fc4973fc1e5c044fb8dc1c55be430cbd707 (patch) | |
| tree | f59cbbd4cc8f9e1e066c76515a9f338e09930903 | |
| parent | bdf40e33d65bb6408cb5ab91712175a0f04ae17b (diff) | |
| download | pango-6a100fc4973fc1e5c044fb8dc1c55be430cbd707.tar.gz | |
Set font options as well.
2005-07-25 Owen Taylor <otaylor@redhat.com>
* pango/pangocairo-fcfont.c (pango_cairo_fc_font_install): Set
font options as well.
* pango/pango-layout.c (line_set_resolved_dir): Always set
line->resolved_dir to one of LTR or RTL. (#171439, Reported
by Chris Blizzard)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 3 | ||||
| -rw-r--r-- | pango/pangocairo-fcfont.c | 1 | ||||
| -rw-r--r-- | pango/pangocairo-fontmap.c | 9 | ||||
| -rw-r--r-- | pango/pangocairo-win32font.c | 5 |
5 files changed, 18 insertions, 3 deletions
@@ -1,5 +1,8 @@ 2005-07-25 Owen Taylor <otaylor@redhat.com> + * pango/pangocairo-fcfont.c (pango_cairo_fc_font_install): Set + font options as well. + * pango/pango-layout.c (line_set_resolved_dir): Always set line->resolved_dir to one of LTR or RTL. (#171439, Reported by Chris Blizzard) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index be93105f..ddfaa9ac 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,8 @@ 2005-07-25 Owen Taylor <otaylor@redhat.com> + * pango/pangocairo-fcfont.c (pango_cairo_fc_font_install): Set + font options as well. + * pango/pango-layout.c (line_set_resolved_dir): Always set line->resolved_dir to one of LTR or RTL. (#171439, Reported by Chris Blizzard) diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c index cc7b3136..c3e99c13 100644 --- a/pango/pangocairo-fcfont.c +++ b/pango/pangocairo-fcfont.c @@ -134,6 +134,7 @@ pango_cairo_fc_font_install (PangoCairoFont *font, cairo_set_font_face (cr, pango_cairo_fc_font_get_font_face (font)); cairo_set_font_matrix (cr, &cffont->font_matrix); + cairo_set_font_options (cr, cffont->options); } static void diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index 51681377..14114f7c 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -329,6 +329,13 @@ pango_cairo_context_get_resolution (PangoContext *context) return -1.0; } +struct _cairo_font_options { + cairo_antialias_t antialias; + cairo_subpixel_order_t subpixel_order; + cairo_hint_style_t hint_style; + cairo_hint_metrics_t hint_metrics; +}; + /** * pango_cairo_context_set_font_options: * @context: a #PangoContext, from pango_cairo_font_map_create_context() @@ -361,7 +368,7 @@ pango_cairo_context_set_font_options (PangoContext *context, info->merged_options = NULL; } } - + /** * pango_cairo_get_font_options: * @context: a #PangoContext, from pango_cairo_font_map_create_context() diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c index c548b933..ad37cc06 100644 --- a/pango/pangocairo-win32font.c +++ b/pango/pangocairo-win32font.c @@ -133,11 +133,12 @@ static void pango_cairo_win32_font_install (PangoCairoFont *font, cairo_t *cr) { - PangoCairoWin32Font *cffont = PANGO_CAIRO_WIN32_FONT (font); + PangoCairoWin32Font *cwfont = PANGO_CAIRO_WIN32_FONT (font); cairo_set_font_face (cr, pango_cairo_win32_font_get_font_face (font)); - cairo_set_font_matrix (cr, &cffont->font_matrix); + cairo_set_font_matrix (cr, &cwfont->font_matrix); + cairo_set_font_optoins (cr, cwfont->options); } static void |