diff options
author | Alex Larsson <alla@lysator.liu.se> | 2001-05-04 21:30:53 +0000 |
---|---|---|
committer | Alexander Larsson <alexl@src.gnome.org> | 2001-05-04 21:30:53 +0000 |
commit | 2c969d984d1186d8762edb7b7ade16c8742c0d73 (patch) | |
tree | a6a7b6e62ebba4b777cd8e971b912950a5ceba6c | |
parent | 188e75c8fe55553a4c8df10fcb6be04b187cdc92 (diff) | |
download | pango-2c969d984d1186d8762edb7b7ade16c8742c0d73.tar.gz |
Set approximate_digit_width and approximate_char_width. The digit one
2001-05-04 Alex Larsson <alla@lysator.liu.se>
* pango/pangoft2.c (get_font_metrics_from_subfonts):
Set approximate_digit_width and approximate_char_width. The
digit one could be done better (see bug 53425).
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-0 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-2 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
-rw-r--r-- | pango/pangoft2.c | 6 |
8 files changed, 48 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2001-05-04 Alex Larsson <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Set approximate_digit_width and approximate_char_width. The + digit one could be done better (see bug 53425). + 2001-05-03 Michael Natterer <mitch@convergence.de> * configure.in: also check for the the Xft header. diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 95557af9..b32d2abb 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,9 @@ +2001-05-04 Alex Larsson <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Set approximate_digit_width and approximate_char_width. The + digit one could be done better (see bug 53425). + 2001-05-03 Michael Natterer <mitch@convergence.de> * configure.in: also check for the the Xft header. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 95557af9..b32d2abb 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +2001-05-04 Alex Larsson <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Set approximate_digit_width and approximate_char_width. The + digit one could be done better (see bug 53425). + 2001-05-03 Michael Natterer <mitch@convergence.de> * configure.in: also check for the the Xft header. diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 95557af9..b32d2abb 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +2001-05-04 Alex Larsson <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Set approximate_digit_width and approximate_char_width. The + digit one could be done better (see bug 53425). + 2001-05-03 Michael Natterer <mitch@convergence.de> * configure.in: also check for the the Xft header. diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 95557af9..b32d2abb 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +2001-05-04 Alex Larsson <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Set approximate_digit_width and approximate_char_width. The + digit one could be done better (see bug 53425). + 2001-05-03 Michael Natterer <mitch@convergence.de> * configure.in: also check for the the Xft header. diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 95557af9..b32d2abb 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +2001-05-04 Alex Larsson <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Set approximate_digit_width and approximate_char_width. The + digit one could be done better (see bug 53425). + 2001-05-03 Michael Natterer <mitch@convergence.de> * configure.in: also check for the the Xft header. diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 95557af9..b32d2abb 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +2001-05-04 Alex Larsson <alla@lysator.liu.se> + + * pango/pangoft2.c (get_font_metrics_from_subfonts): + Set approximate_digit_width and approximate_char_width. The + digit one could be done better (see bug 53425). + 2001-05-03 Michael Natterer <mitch@convergence.de> * configure.in: also check for the the Xft header. diff --git a/pango/pangoft2.c b/pango/pangoft2.c index dbe66c0c..6c59ce79 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -526,12 +526,18 @@ get_font_metrics_from_subfonts (PangoFont *font, { metrics->ascent = PANGO_UNITS_26_6 (face->size->metrics.ascender); metrics->descent = PANGO_UNITS_26_6 (-face->size->metrics.descender); + metrics->approximate_digit_width = PANGO_UNITS_26_6 (face->size->metrics.max_advance); + metrics->approximate_char_width = PANGO_UNITS_26_6 (face->size->metrics.max_advance); first = FALSE; } else { 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); + metrics->approximate_digit_width = + MAX (PANGO_UNITS_26_6 (face->size->metrics.max_advance), metrics->approximate_digit_width); + metrics->approximate_char_width = + MAX (PANGO_UNITS_26_6 (face->size->metrics.max_advance), metrics->approximate_char_width); } tmp_list = tmp_list->next; |