diff options
author | Matthias Clasen <mclasen@redhat.com> | 2019-07-04 22:06:06 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2019-07-05 15:47:23 -0400 |
commit | d75d9598e8b0a704c7bbfbbc61877386b6a86327 (patch) | |
tree | 42a727cd32702883f4f7f06288e069fad518619b /pango/pangocairo-font.c | |
parent | 05750deb6fbab92a1635b00085f819c96eafb38f (diff) | |
download | pango-d75d9598e8b0a704c7bbfbbc61877386b6a86327.tar.gz |
Add line height to font metrics
Add a getter for the line height of a font.
Diffstat (limited to 'pango/pangocairo-font.c')
-rw-r--r-- | pango/pangocairo-font.c | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c index cc2e7bee..7915be6f 100644 --- a/pango/pangocairo-font.c +++ b/pango/pangocairo-font.c @@ -224,6 +224,7 @@ _pango_cairo_font_get_metrics (PangoFont *font, PangoCairoFontPrivate *cf_priv = PANGO_CAIRO_FONT_PRIVATE (font); PangoCairoFontMetricsInfo *info = NULL; /* Quiet gcc */ GSList *tmp_list; + static int in_get_metrics; const char *sample_str = pango_language_get_sample_string (language); @@ -293,35 +294,43 @@ _pango_cairo_font_get_metrics (PangoFont *font, info->metrics->ascent *= xscale; info->metrics->descent *= xscale; + info->metrics->height *= xscale; info->metrics->underline_position *= xscale; info->metrics->underline_thickness *= xscale; info->metrics->strikethrough_position *= xscale; info->metrics->strikethrough_thickness *= xscale; } - /* Set the matrix on the context so we don't have to adjust the derived * metrics. */ pango_context_set_matrix (context, &pango_matrix); - /* Update approximate_*_width now */ - layout = pango_layout_new (context); - desc = pango_font_describe_with_absolute_size (font); - pango_layout_set_font_description (layout, desc); - pango_font_description_free (desc); + /* Ugly. We need to prevent recursion when we call into + * PangoLayout to determine approximate char width. + */ + if (!in_get_metrics) + { + in_get_metrics = 1; - pango_layout_set_text (layout, sample_str, -1); - pango_layout_get_extents (layout, NULL, &extents); + /* Update approximate_*_width now */ + layout = pango_layout_new (context); + desc = pango_font_describe_with_absolute_size (font); + pango_layout_set_font_description (layout, desc); + pango_font_description_free (desc); - sample_str_width = pango_utf8_strwidth (sample_str); - g_assert (sample_str_width > 0); - info->metrics->approximate_char_width = extents.width / sample_str_width; + pango_layout_set_text (layout, sample_str, -1); + pango_layout_get_extents (layout, NULL, &extents); - pango_layout_set_text (layout, "0123456789", -1); - info->metrics->approximate_digit_width = max_glyph_width (layout); + sample_str_width = pango_utf8_strwidth (sample_str); + g_assert (sample_str_width > 0); + info->metrics->approximate_char_width = extents.width / sample_str_width; - g_object_unref (layout); + pango_layout_set_text (layout, "0123456789", -1); + info->metrics->approximate_digit_width = max_glyph_width (layout); + g_object_unref (layout); + in_get_metrics = 0; + } /* We may actually reuse ascent/descent we got from cairo here. that's * in cf_priv->font_extents. @@ -355,6 +364,7 @@ _pango_cairo_font_get_metrics (PangoFont *font, g_object_unref (fontmap); } +out: return pango_font_metrics_ref (info->metrics); } |