diff options
Diffstat (limited to 'pango/pangocairo-font.c')
| -rw-r--r-- | pango/pangocairo-font.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c index 598065c0..0374971a 100644 --- a/pango/pangocairo-font.c +++ b/pango/pangocairo-font.c @@ -185,26 +185,29 @@ _pango_cairo_font_install (PangoFont *font, return TRUE; } - static int max_glyph_width (PangoLayout *layout) { + PangoLines *lines; int max_width = 0; - GSList *l, *r; + GSList *r; - for (l = pango_layout_get_lines_readonly (layout); l; l = l->next) + lines = pango_layout_get_lines (layout); + for (int i = 0; i < pango_lines_get_line_count (lines); i++) { - PangoLayoutLine *line = l->data; - - for (r = line->runs; r; r = r->next) - { - PangoGlyphString *glyphs = ((PangoGlyphItem *)r->data)->glyphs; - int i; + PangoLayoutLine *line = pango_lines_get_line (lines, i, NULL, NULL); - for (i = 0; i < glyphs->num_glyphs; i++) - if (glyphs->glyphs[i].geometry.width > max_width) - max_width = glyphs->glyphs[i].geometry.width; - } + for (r = pango_layout_line_get_runs (line); r; r = r->next) + { + PangoGlyphString *glyphs = ((PangoGlyphItem *)r->data)->glyphs; + int i; + + for (i = 0; i < glyphs->num_glyphs; i++) + { + if (glyphs->glyphs[i].geometry.width > max_width) + max_width = glyphs->glyphs[i].geometry.width; + } + } } return max_width; @@ -319,7 +322,7 @@ _pango_cairo_font_get_metrics (PangoFont *font, pango_font_description_free (desc); pango_layout_set_text (layout, sample_str, -1); - pango_layout_get_extents (layout, NULL, &extents); + pango_lines_get_extents (pango_layout_get_lines (layout), NULL, &extents); sample_str_width = pango_utf8_strwidth (sample_str); g_assert (sample_str_width > 0); |