diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-05-09 01:25:13 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-05-09 01:25:13 +0000 |
| commit | b3ebe097a3042737165ba497dc5b08f235df8167 (patch) | |
| tree | 73bd52895823051c8015435553ee3541a5290740 | |
| parent | 736b687b92f93b268fccdf727f1cfd259bd903ed (diff) | |
| parent | f8df3ae66566d778dda3d95d5a79971e9fc184ee (diff) | |
| download | pango-b3ebe097a3042737165ba497dc5b08f235df8167.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
layout: Fix a small optimization
See merge request GNOME/pango!320
| -rw-r--r-- | pango/pango-break.h | 2 | ||||
| -rw-r--r-- | pango/pango-layout.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/pango/pango-break.h b/pango/pango-break.h index ae7d953a..16f3918c 100644 --- a/pango/pango-break.h +++ b/pango/pango-break.h @@ -51,7 +51,7 @@ G_BEGIN_DECLS * so all chars are in some sentence; @is_sentence_boundary denotes * the boundaries there. The second way doesn't assign * between-sentence spaces, etc. to any sentence, so - * @is_sentence_start/@is_sentence_end mark the boundaries of those sentences. + * @is_sentence_start/@is_sentence_end mark the boundaries of those sentences. * @is_sentence_start: is first character in a sentence * @is_sentence_end: is first char after a sentence. * Note that in degenerate cases, you could have both @is_sentence_start diff --git a/pango/pango-layout.c b/pango/pango-layout.c index e847e789..57ec7606 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -356,11 +356,6 @@ pango_layout_set_width (PangoLayout *layout, if (width != layout->width) { layout->width = width; - - /* Increasing the width can only decrease the line count */ - if (layout->line_count == 1 && width > layout->width) - return; - layout_changed (layout); } } |