diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-03-01 22:11:57 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-03-01 22:11:57 +0000 |
| commit | c0b7bacb185c3d1da8790168f84413b5b7cb6898 (patch) | |
| tree | d68909ef079fa296bb0af77eb6567669c051550b | |
| parent | 59d48e76715234cc81be6b819af6ba022e41d3ef (diff) | |
| download | pango-c0b7bacb185c3d1da8790168f84413b5b7cb6898.tar.gz | |
Don't break lines on LINE_SEPARATOR in single-paragraph mode. (#168589,
2005-03-01 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (process_item): Don't break
lines on LINE_SEPARATOR in single-paragraph mode.
(#168589, Damon Chaplin)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | pango/pango-layout.c | 3 |
3 files changed, 14 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2005-03-01 Owen Taylor <otaylor@redhat.com> + * pango/pango-layout.c (process_item): Don't break + lines on LINE_SEPARATOR in single-paragraph mode. + (#168589, Damon Chaplin) + +2005-03-01 Owen Taylor <otaylor@redhat.com> + * pango/pangoxft-font.c: Fix a typo in the last commit (Manish Singh) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index c5aaf10c..041159cd 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,11 @@ 2005-03-01 Owen Taylor <otaylor@redhat.com> + * pango/pango-layout.c (process_item): Don't break + lines on LINE_SEPARATOR in single-paragraph mode. + (#168589, Damon Chaplin) + +2005-03-01 Owen Taylor <otaylor@redhat.com> + * pango/pangoxft-font.c: Fix a typo in the last commit (Manish Singh) diff --git a/pango/pango-layout.c b/pango/pango-layout.c index d475a945..98129595 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -2777,7 +2777,8 @@ process_item (PangoLayout *layout, processing_new_item = TRUE; } - if (g_utf8_get_char (layout->text + item->offset) == LINE_SEPARATOR) + if (!layout->single_paragraph && + g_utf8_get_char (layout->text + item->offset) == LINE_SEPARATOR) { insert_run (line, state, item, TRUE); state->log_widths_offset += item->num_chars; |