summaryrefslogtreecommitdiff
path: root/pango/pango-context.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-07-16 18:42:39 -0400
committerMatthias Clasen <mclasen@redhat.com>2019-07-16 18:42:39 -0400
commit0df4945d792281cecaddf029919ddbec3ca924a7 (patch)
tree3e928d2f7718aeac3bb711a2768dd79a21ef9677 /pango/pango-context.c
parentb9fa9ccc28d0025637ce53312a3f40f354cbd56d (diff)
downloadpango-0df4945d792281cecaddf029919ddbec3ca924a7.tar.gz
context: Treat metrics height like ascent+descent
PangoContext has somewhat redundant code to create metrics, which wasn't treating the new height member like it should.
Diffstat (limited to 'pango/pango-context.c')
-rw-r--r--pango/pango-context.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c
index 6a5dcfdd..ca4c33b6 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -1762,6 +1762,7 @@ update_metrics_from_items (PangoFontMetrics *metrics,
/* metrics will already be initialized from the first font in the fontset */
metrics->ascent = MAX (metrics->ascent, raw_metrics->ascent);
metrics->descent = MAX (metrics->descent, raw_metrics->descent);
+ metrics->height = MAX (metrics->height, raw_metrics->height);
pango_font_metrics_unref (raw_metrics);
}