diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-05-09 03:51:18 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-05-09 03:51:18 +0000 |
| commit | 2185eed3e3979e63df73e9248101318839aa5242 (patch) | |
| tree | 1c796070065d6e53c13d809847ca38de2f2c6ec8 /pango | |
| parent | 71ad5cbaf0fea521a526a5ce341b3ea17b03c9cf (diff) | |
| parent | 10895f2d9794fb36820c827a3a68b3ee1559ac20 (diff) | |
| download | pango-2185eed3e3979e63df73e9248101318839aa5242.tar.gz | |
Merge branch 'fix-layout-line-height' into 'master'
Make pango_layout_line_get_height work
Closes #487
See merge request GNOME/pango!327
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pango-layout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c index c483526f..2fe6c9dc 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -4982,7 +4982,7 @@ pango_layout_run_get_extents_and_height (PangoLayoutRun *run, gboolean has_underline; gboolean has_overline; - if (G_UNLIKELY (!run_ink && !run_logical)) + if (G_UNLIKELY (!run_ink && !run_logical && !height)) return; pango_layout_get_item_properties (run->item, &properties); @@ -5107,7 +5107,7 @@ pango_layout_line_get_extents_and_height (PangoLayoutLine *line, g_return_if_fail (LINE_IS_VALID (line)); - if (G_UNLIKELY (!ink_rect && !logical_rect)) + if (G_UNLIKELY (!ink_rect && !logical_rect && !height)) return; switch (private->cache_status) |