diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-03-01 21:34:49 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-03-01 21:34:49 +0000 |
| commit | 6e0ad63d99f043529434fc703c022d80537afdce (patch) | |
| tree | 6b62652c05ec02ab6c69589c550a45be74375cf8 | |
| parent | 857c69a5513be76ed91a7989b4831a0d47e01fe9 (diff) | |
| download | pango-6e0ad63d99f043529434fc703c022d80537afdce.tar.gz | |
Delete FC_SPACING value out of pattern before passing it to Xft, to
2005-03-01 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-font.c (xft_font_get_font): Delete
FC_SPACING value out of pattern before passing it
to Xft, to prevent Xft clipping characters and
trashing metrics. (#164879, Billy Biggs)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | pango/pangoxft-font.c | 5 |
3 files changed, 18 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2005-03-01 Owen Taylor <otaylor@redhat.com> + * pango/pangoxft-font.c (xft_font_get_font): Delete + FC_SPACING value out of pattern before passing it + to Xft, to prevent Xft clipping characters and + trashing metrics. (#164879, Billy Biggs) + +2005-03-01 Owen Taylor <otaylor@redhat.com> + * pango/pango-context.c (pango_context_get_metrics): Use the language from the context if %NULL is passed in for @language. (#163472) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 186c0c27..cc97e373 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,12 @@ 2005-03-01 Owen Taylor <otaylor@redhat.com> + * pango/pangoxft-font.c (xft_font_get_font): Delete + FC_SPACING value out of pattern before passing it + to Xft, to prevent Xft clipping characters and + trashing metrics. (#164879, Billy Biggs) + +2005-03-01 Owen Taylor <otaylor@redhat.com> + * pango/pango-context.c (pango_context_get_metrics): Use the language from the context if %NULL is passed in for @language. (#163472) diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 632ec433..c8fab24c 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -381,9 +381,12 @@ xft_font_get_font (PangoFont *font) if (xfont->xft_font == NULL) { + FcPattern *pattern = FcPatternDuplicate (fcfont->font_pattern); + FcPatternDel (pattern, FC_SPACING); + _pango_xft_font_map_get_info (fcfont->fontmap, &display, &screen); - xfont->xft_font = XftFontOpenPattern (display, FcPatternDuplicate (fcfont->font_pattern)); + font->xft_font = XftFontOpenPattern (display, pattern); if (!xfont->xft_font) { gchar *name = pango_font_description_to_string (fcfont->description); |