diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-12-10 15:52:00 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-12-10 15:52:00 +0000 |
| commit | 478ed480cbb4c12f0b794b0e43380d0c92dfba07 (patch) | |
| tree | 4705f95bbbc946841ab5709f0897b3c23cf7c906 /pango | |
| parent | ed501e35b65432d62f955a126d2632d4286a915d (diff) | |
| download | pango-478ed480cbb4c12f0b794b0e43380d0c92dfba07.tar.gz | |
Fix problem with returned width on lines other than the first line
Mon Dec 10 09:18:09 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (pango_layout_index_to_pos):
Fix problem with returned width on lines other than
the first line (#66274).
* pango/pangox,ft2,win32.c (pango_*_render_layout):
Fix problem where indent wasn't honored (#66275).
[ Note, however, there are remaining problems - see, #66626 ]
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pango-layout.c | 2 | ||||
| -rw-r--r-- | pango/pangoft2.c | 2 | ||||
| -rw-r--r-- | pango/pangowin32.c | 2 | ||||
| -rw-r--r-- | pango/pangox.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 29295b23..148909b3 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -1509,7 +1509,7 @@ pango_layout_index_to_pos (PangoLayout *layout, pango_layout_line_index_to_x (layout_line, index, 0, &x_pos); pos->x = logical_rect.x + x_pos; - if (index < layout_line->length) + if (index < layout_line->start_index + layout_line->length) { pango_layout_line_index_to_x (layout_line, index, 1, &x_pos); pos->width = (logical_rect.x + x_pos) - pos->x; diff --git a/pango/pangoft2.c b/pango/pangoft2.c index a5b83ba1..fc62b6f7 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -756,7 +756,7 @@ pango_ft2_render_layout (FT_Bitmap *bitmap, int width; int y_offset = 0; - gboolean first = FALSE; + gboolean first = TRUE; g_return_if_fail (bitmap != NULL); g_return_if_fail (layout != NULL); diff --git a/pango/pangowin32.c b/pango/pangowin32.c index f9634011..e444e179 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -643,7 +643,7 @@ pango_win32_render_layout (HDC hdc, int width; int y_offset = 0; - gboolean first = FALSE; + gboolean first = TRUE; g_return_if_fail (layout != NULL); diff --git a/pango/pangox.c b/pango/pangox.c index 5200e6fa..553b48d8 100644 --- a/pango/pangox.c +++ b/pango/pangox.c @@ -1543,7 +1543,7 @@ pango_x_render_layout (Display *display, int width; int y_offset = 0; - gboolean first = FALSE; + gboolean first = TRUE; g_return_if_fail (display != NULL); g_return_if_fail (layout != NULL); |