summaryrefslogtreecommitdiff
path: root/pango/pango-layout.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-08-03 20:35:30 +0000
committerMatthias Clasen <mclasen@redhat.com>2019-08-03 20:35:30 +0000
commit55748a5a4bf928338cf704a3f955a5bdeef1fcd4 (patch)
tree0a366fb3a5576530ca62292db6e6244d53391ef0 /pango/pango-layout.c
parent519c36733acb31a15c9f416f845c7887bfe64121 (diff)
parentc3c030744fe75b987455a0e999bf12158c0a24a0 (diff)
downloadpango-55748a5a4bf928338cf704a3f955a5bdeef1fcd4.tar.gz
Merge branch 'round-glyphs-option' into 'master'
Round glyphs option See merge request GNOME/pango!120
Diffstat (limited to 'pango/pango-layout.c')
-rw-r--r--pango/pango-layout.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 521f806a..0ddb6e14 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3354,14 +3354,20 @@ shape_run (PangoLayoutLine *line,
shape_tab (line, item, glyphs);
else
{
+ PangoShapeFlags shape_flags = PANGO_SHAPE_NONE;
+
+ if (pango_context_get_round_glyph_positions (layout->context))
+ shape_flags |= PANGO_SHAPE_ROUND_POSITIONS;
+
if (state->properties.shape_set)
_pango_shape_shape (layout->text + item->offset, item->num_chars,
state->properties.shape_ink_rect, state->properties.shape_logical_rect,
glyphs);
else
- pango_shape_full (layout->text + item->offset, item->length,
- layout->text, layout->length,
- &item->analysis, glyphs);
+ pango_shape_with_flags (layout->text + item->offset, item->length,
+ layout->text, layout->length,
+ &item->analysis, glyphs,
+ shape_flags);
if (state->properties.letter_spacing)
{