summaryrefslogtreecommitdiff
path: root/pango/pangoft2.c
diff options
context:
space:
mode:
author8 <alla@lysator.liu.se>2001-01-18 14:14:17 +0000
committerAlexander Larsson <alexl@src.gnome.org>2001-01-18 14:14:17 +0000
commitb425950b463041cb7ed58367507f1ca528535a12 (patch)
tree06f25f894904c3c94fcb76062fb1373e067b314a /pango/pangoft2.c
parentc7fca238d48e14b77d42efff9f399f6a40de2f19 (diff)
downloadpango-b425950b463041cb7ed58367507f1ca528535a12.tar.gz
Use correct font metrics information.
2001-01-18 <alla@lysator.liu.se> * pango/pangoft2.c (get_font_metrics_from_subfonts): Use correct font metrics information.
Diffstat (limited to 'pango/pangoft2.c')
-rw-r--r--pango/pangoft2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 4cb56e99..f74a55fb 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -524,14 +524,14 @@ get_font_metrics_from_subfonts (PangoFont *font,
if (first)
{
- metrics->ascent = PANGO_UNITS_26_6 (face->ascender);
- metrics->descent = PANGO_UNITS_26_6 (face->descender);
+ metrics->ascent = PANGO_UNITS_26_6 (face->size->metrics.ascender);
+ metrics->descent = PANGO_UNITS_26_6 (-face->size->metrics.descender);
first = FALSE;
}
else
{
- metrics->ascent = MAX (PANGO_UNITS_26_6 (face->ascender), metrics->ascent);
- metrics->descent = MAX (PANGO_UNITS_26_6 (face->descender), metrics->descent);
+ metrics->ascent = MAX (PANGO_UNITS_26_6 (face->size->metrics.ascender), metrics->ascent);
+ metrics->descent = MAX (PANGO_UNITS_26_6 (-face->size->metrics.descender), metrics->descent);
}
tmp_list = tmp_list->next;