diff options
| author | Tor Lillqvist <tml@iki.fi> | 2004-12-14 01:08:44 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2004-12-14 01:08:44 +0000 |
| commit | b1aa8d58cf757258edf02c73d1fca2d1ea40216e (patch) | |
| tree | b73acdbd59dab090f200d36317c27b65dcedc71f | |
| parent | 5ff0e691ffc04f5d7c80fb75c1742433748cea89 (diff) | |
| download | pango-b1aa8d58cf757258edf02c73d1fca2d1ea40216e.tar.gz | |
Set also underline and strikethrough position and thickness. (#161205)
2004-12-14 Tor Lillqvist <tml@iki.fi>
* pango/pangowin32.c (pango_win32_font_get_metrics): Set also
underline and strikethrough position and thickness. (#161205)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | pango/pangowin32.c | 7 |
4 files changed, 22 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2004-12-14 Tor Lillqvist <tml@iki.fi> + + * pango/pangowin32.c (pango_win32_font_get_metrics): Set also + underline and strikethrough position and thickness. (#161205) + Thu Dec 2 15:31:33 2004 Owen Taylor <otaylor@redhat.com> * pango/break.c (pango_default_break): Ignore formatting diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index bd36c7c9..c335cd1f 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2004-12-14 Tor Lillqvist <tml@iki.fi> + + * pango/pangowin32.c (pango_win32_font_get_metrics): Set also + underline and strikethrough position and thickness. (#161205) + Thu Dec 2 15:31:33 2004 Owen Taylor <otaylor@redhat.com> * pango/break.c (pango_default_break): Ignore formatting diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index bd36c7c9..c335cd1f 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2004-12-14 Tor Lillqvist <tml@iki.fi> + + * pango/pangowin32.c (pango_win32_font_get_metrics): Set also + underline and strikethrough position and thickness. (#161205) + Thu Dec 2 15:31:33 2004 Owen Taylor <otaylor@redhat.com> * pango/break.c (pango_default_break): Ignore formatting diff --git a/pango/pangowin32.c b/pango/pangowin32.c index e3f62a10..9b95730d 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -540,6 +540,13 @@ pango_win32_font_get_metrics (PangoFont *font, pango_layout_set_text (layout, "0123456789", -1); metrics->approximate_digit_width = max_glyph_width (layout); + /* FIXME: Should get the real values from the TrueType font file */ + metrics->underline_position = -2 * PANGO_SCALE; + metrics->underline_thickness = 1 * PANGO_SCALE; + metrics->strikethrough_thickness = metrics->underline_thickness; + /* Really really wild guess */ + metrics->strikethrough_position = metrics->ascent / 3; + pango_font_description_free (font_desc); g_object_unref (layout); g_object_unref (context); |