diff options
| author | 8 <alla@lysator.liu.se> | 2001-01-18 14:14:17 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2001-01-18 14:14:17 +0000 |
| commit | b425950b463041cb7ed58367507f1ca528535a12 (patch) | |
| tree | 06f25f894904c3c94fcb76062fb1373e067b314a | |
| parent | c7fca238d48e14b77d42efff9f399f6a40de2f19 (diff) | |
| download | pango-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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | pango/pangoft2.c | 8 |
8 files changed, 39 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2001-01-18 <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Use correct font metrics information. + 2001-01-07 Tor Lillqvist <tml@iki.fi> * pango/fonts.c (pango_font_description_to_filename): Allow '+' in diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 0039b2c1..0998a64d 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,8 @@ +2001-01-18 <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Use correct font metrics information. + 2001-01-07 Tor Lillqvist <tml@iki.fi> * pango/fonts.c (pango_font_description_to_filename): Allow '+' in diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 0039b2c1..0998a64d 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2001-01-18 <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Use correct font metrics information. + 2001-01-07 Tor Lillqvist <tml@iki.fi> * pango/fonts.c (pango_font_description_to_filename): Allow '+' in diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 0039b2c1..0998a64d 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +2001-01-18 <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Use correct font metrics information. + 2001-01-07 Tor Lillqvist <tml@iki.fi> * pango/fonts.c (pango_font_description_to_filename): Allow '+' in diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 0039b2c1..0998a64d 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2001-01-18 <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Use correct font metrics information. + 2001-01-07 Tor Lillqvist <tml@iki.fi> * pango/fonts.c (pango_font_description_to_filename): Allow '+' in diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 0039b2c1..0998a64d 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2001-01-18 <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Use correct font metrics information. + 2001-01-07 Tor Lillqvist <tml@iki.fi> * pango/fonts.c (pango_font_description_to_filename): Allow '+' in diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 0039b2c1..0998a64d 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2001-01-18 <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Use correct font metrics information. + 2001-01-07 Tor Lillqvist <tml@iki.fi> * pango/fonts.c (pango_font_description_to_filename): Allow '+' in 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; |