diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-03-01 22:12:06 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-03-01 22:12:06 +0000 |
| commit | 1bb62f96b4f07edc4d7fa3082c5dc826541df890 (patch) | |
| tree | 67c02c8b062127e942e7638964f029159e2699f7 | |
| parent | a37e5110ed8e0ba070b5c7a92e0eddc0c2eec342 (diff) | |
| download | pango-1bb62f96b4f07edc4d7fa3082c5dc826541df890.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 | ||||
| -rw-r--r-- | pango/pangoxft-font.c | 2 |
4 files changed, 15 insertions, 2 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 69384b33..6901a843 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 53106f20..8fef04bd 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; diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index c8fab24c..210a939a 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -386,7 +386,7 @@ xft_font_get_font (PangoFont *font) _pango_xft_font_map_get_info (fcfont->fontmap, &display, &screen); - font->xft_font = XftFontOpenPattern (display, pattern); + xfont->xft_font = XftFontOpenPattern (display, pattern); if (!xfont->xft_font) { gchar *name = pango_font_description_to_string (fcfont->description); |