diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-01-10 20:07:52 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-01-10 20:07:52 +0000 |
| commit | 366a6f92ebe654194dd4b6c4caf13f9ab594024c (patch) | |
| tree | 5ae091fd7e56e0b5d6421251611b0b58ba50c4bf | |
| parent | c028808696a65c64e206cebe853c39a4cf86888b (diff) | |
| download | pango-366a6f92ebe654194dd4b6c4caf13f9ab594024c.tar.gz | |
Don't offset the logical rect by y_offset - this generally is not desired,
Thu Jan 10 15:04:31 2002 Owen Taylor <otaylor@redhat.com>
* pango/glyphstring.c (pango_glyph_string_extents_range):
Don't offset the logical rect by y_offset - this generally
is not desired, since it means that the logical height
of a line could change if it included accented characters.
(#67921, Dov Grobgeld)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 7 | ||||
| -rw-r--r-- | pango/glyphstring.c | 4 |
8 files changed, 51 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Thu Jan 10 15:04:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/glyphstring.c (pango_glyph_string_extents_range): + Don't offset the logical rect by y_offset - this generally + is not desired, since it means that the logical height + of a line could change if it included accented characters. + 2002-01-09 Alex Larsson <alexl@redhat.com> * pango/pangoxft-fontmap.c (pango_xft_font_map_load_fontset): diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index af2369df..caed40a8 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,10 @@ +Thu Jan 10 15:04:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/glyphstring.c (pango_glyph_string_extents_range): + Don't offset the logical rect by y_offset - this generally + is not desired, since it means that the logical height + of a line could change if it included accented characters. + 2002-01-09 Alex Larsson <alexl@redhat.com> * pango/pangoxft-fontmap.c (pango_xft_font_map_load_fontset): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index af2369df..caed40a8 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +Thu Jan 10 15:04:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/glyphstring.c (pango_glyph_string_extents_range): + Don't offset the logical rect by y_offset - this generally + is not desired, since it means that the logical height + of a line could change if it included accented characters. + 2002-01-09 Alex Larsson <alexl@redhat.com> * pango/pangoxft-fontmap.c (pango_xft_font_map_load_fontset): diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index af2369df..caed40a8 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,10 @@ +Thu Jan 10 15:04:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/glyphstring.c (pango_glyph_string_extents_range): + Don't offset the logical rect by y_offset - this generally + is not desired, since it means that the logical height + of a line could change if it included accented characters. + 2002-01-09 Alex Larsson <alexl@redhat.com> * pango/pangoxft-fontmap.c (pango_xft_font_map_load_fontset): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index af2369df..caed40a8 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,10 @@ +Thu Jan 10 15:04:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/glyphstring.c (pango_glyph_string_extents_range): + Don't offset the logical rect by y_offset - this generally + is not desired, since it means that the logical height + of a line could change if it included accented characters. + 2002-01-09 Alex Larsson <alexl@redhat.com> * pango/pangoxft-fontmap.c (pango_xft_font_map_load_fontset): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index af2369df..caed40a8 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,10 @@ +Thu Jan 10 15:04:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/glyphstring.c (pango_glyph_string_extents_range): + Don't offset the logical rect by y_offset - this generally + is not desired, since it means that the logical height + of a line could change if it included accented characters. + 2002-01-09 Alex Larsson <alexl@redhat.com> * pango/pangoxft-fontmap.c (pango_xft_font_map_load_fontset): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index af2369df..caed40a8 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,10 @@ +Thu Jan 10 15:04:31 2002 Owen Taylor <otaylor@redhat.com> + + * pango/glyphstring.c (pango_glyph_string_extents_range): + Don't offset the logical rect by y_offset - this generally + is not desired, since it means that the logical height + of a line could change if it included accented characters. + 2002-01-09 Alex Larsson <alexl@redhat.com> * pango/pangoxft-fontmap.c (pango_xft_font_map_load_fontset): diff --git a/pango/glyphstring.c b/pango/glyphstring.c index 26b67dd7..9a930a37 100644 --- a/pango/glyphstring.c +++ b/pango/glyphstring.c @@ -214,9 +214,9 @@ pango_glyph_string_extents_range (PangoGlyphString *glyphs, { logical_rect->width += geometry->width; - new_pos = MIN (logical_rect->y, glyph_logical.y + geometry->y_offset); + new_pos = MIN (logical_rect->y, glyph_logical.y); logical_rect->height = MAX (logical_rect->y + logical_rect->height, - glyph_logical.y + glyph_logical.height + geometry->y_offset) - new_pos; + glyph_logical.y + glyph_logical.height) - new_pos; logical_rect->y = new_pos; } } |