diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-05-08 23:43:35 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-05-08 23:44:38 -0400 |
commit | 10895f2d9794fb36820c827a3a68b3ee1559ac20 (patch) | |
tree | 264e70023640171befbdcd2668baf8287e5d2099 /pango | |
parent | b3ebe097a3042737165ba497dc5b08f235df8167 (diff) | |
download | pango-10895f2d9794fb36820c827a3a68b3ee1559ac20.tar.gz |
Make pango_layout_line_get_height workfix-layout-line-height
We were just never setting the height. Ouch!
Test included.
Fixes: #487
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 57ec7606..df7607fe 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) |