diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-08-28 17:07:34 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-08-28 17:07:34 +0000 |
commit | 17f577e5071be414e8430523e968e54a072ddf67 (patch) | |
tree | 777d4d311ea9287967f06a5623ea8fada1333b65 | |
parent | 54e1aed0c2a32a8a5486220751f1100d01aef9b7 (diff) | |
parent | ada1bc9385d638e4c42a5aa58706c0a6874779e7 (diff) | |
download | pango-17f577e5071be414e8430523e968e54a072ddf67.tar.gz |
Merge branch 'underline-kerning' into 'main'
renderer: Use ink rects for line lengths
Closes #139
See merge request GNOME/pango!448
-rw-r--r-- | pango/pango-renderer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c index c91cb6ee..055cdd97 100644 --- a/pango/pango-renderer.c +++ b/pango/pango-renderer.c @@ -362,8 +362,8 @@ add_underline (PangoRenderer *renderer, int underline_thickness = pango_font_metrics_get_underline_thickness (metrics); int underline_position = pango_font_metrics_get_underline_position (metrics); - new_rect.x = base_x + logical_rect->x; - new_rect.width = logical_rect->width; + new_rect.x = base_x + ink_rect->x; + new_rect.width = ink_rect->width; new_rect.height = underline_thickness; new_rect.y = base_y; @@ -425,8 +425,8 @@ add_overline (PangoRenderer *renderer, int underline_thickness = pango_font_metrics_get_underline_thickness (metrics); int ascent = pango_font_metrics_get_ascent (metrics); - new_rect.x = base_x + logical_rect->x; - new_rect.width = logical_rect->width; + new_rect.x = base_x + ink_rect->x; + new_rect.width = ink_rect->width; new_rect.height = underline_thickness; new_rect.y = base_y; @@ -480,8 +480,8 @@ add_strikethrough (PangoRenderer *renderer, int strikethrough_thickness = pango_font_metrics_get_strikethrough_thickness (metrics); int strikethrough_position = pango_font_metrics_get_strikethrough_position (metrics); - new_rect.x = base_x + logical_rect->x; - new_rect.width = logical_rect->width; + new_rect.x = base_x + ink_rect->x; + new_rect.width = ink_rect->width; new_rect.y = (base_y - strikethrough_position) * num_glyphs; new_rect.height = strikethrough_thickness * num_glyphs; |