summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-01-21 22:53:29 +0000
committerMatthias Clasen <mclasen@redhat.com>2021-01-21 22:53:29 +0000
commit9e48acef97708eab355fce3659626e2d97161157 (patch)
treed1d20c7b9ef70a18e8dac07439aed38cbe92bf23
parent30748213af2bdc373aab076927a7c73ec314b776 (diff)
parent4c6f0b3c0e03731ef4e44cda5ab42c768dc761a2 (diff)
downloadpango-9e48acef97708eab355fce3659626e2d97161157.tar.gz
Merge branch 'vertical' into 'master'
Translate origin point for vertical layout Closes #454 See merge request GNOME/pango!168
-rw-r--r--pango/pangofc-shape.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c
index b6f74ca1..16d5d84d 100644
--- a/pango/pangofc-shape.c
+++ b/pango/pangofc-shape.c
@@ -409,9 +409,12 @@ pango_hb_shape (PangoFont *font,
for (i = 0; i < num_glyphs; i++)
{
/* 90 degrees rotation counter-clockwise. */
- infos[i].geometry.width = hb_position->y_advance;
- infos[i].geometry.x_offset = hb_position->y_offset;
- infos[i].geometry.y_offset = - hb_position->x_offset;
+ hb_position_t x_origin = 0, y_origin = 0;
+ hb_font_get_glyph_v_origin
+ (hb_font, infos[i].glyph, &x_origin, &y_origin);
+ infos[i].geometry.width = - hb_position->y_advance;
+ infos[i].geometry.x_offset = - hb_position->y_offset - y_origin;
+ infos[i].geometry.y_offset = - hb_position->x_offset - x_origin;
hb_position++;
}
else /* horizontal */