[pango/line-breaking-fixes: 18/21] layout: Cosmetics
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/line-breaking-fixes: 18/21] layout: Cosmetics
- Date: Sat, 13 Nov 2021 02:42:16 +0000 (UTC)
commit bb7454bb5c4e95f311042e1fb95b97ec0ceeb025
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Nov 12 21:01:18 2021 -0500
layout: Cosmetics
pango/pango-layout.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 13e974d2..553bcb70 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3974,9 +3974,8 @@ process_item (PangoLayout *layout,
if (layout->wrap == PANGO_WRAP_WORD_CHAR && force_fit && break_width + break_extra_width >
state->remaining_width && !retrying_with_char_breaks)
{
retrying_with_char_breaks = TRUE;
- num_chars = item->num_chars;
width = orig_width;
- break_num_chars = num_chars;
+ break_num_chars = item->num_chars;
break_width = width;
goto retry_break;
}
@@ -4036,9 +4035,8 @@ process_item (PangoLayout *layout,
break_disabled[break_num_chars] = TRUE;
- num_chars = item->num_chars;
width = orig_width;
- break_num_chars = num_chars;
+ break_num_chars = item->num_chars;
break_width = width;
goto retry_break;
@@ -4262,8 +4260,9 @@ process_line (PangoLayout *layout,
case BREAK_LINE_SEPARATOR:
state->items = g_list_delete_link (state->items, state->items);
state->start_offset += old_num_chars;
- /* A line-separate is just a forced break. Set wrapped, so we do
- * justification */
+ /* A line-separator is just a forced break.
+ * Set wrapped, so we do justification
+ */
wrapped = TRUE;
goto done;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]