[pango: 21/21] Merge branch 'wip/baedert/for-master2' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango: 21/21] Merge branch 'wip/baedert/for-master2' into 'master'
- Date: Mon, 8 Jun 2020 17:42:09 +0000 (UTC)
commit 8175bfe7ebbdd885cfdab857783aa2e5f7c136e4
Merge: 1fb9e50c 4d8e7147
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Jun 8 17:41:58 2020 +0000
Merge branch 'wip/baedert/for-master2' into 'master'
Wip/baedert/for master2
See merge request GNOME/pango!190
pango/break.c | 30 ++++---
pango/ellipsize.c | 15 ++--
pango/pango-attributes-private.h | 48 +++++++++++
pango/pango-attributes.c | 96 ++++++++++++---------
pango/pango-glyph-item.c | 20 +++--
pango/pango-layout.c | 175 +++++++++++++++++++++++++--------------
pango/pangocairo-context.c | 10 ++-
tests/layouts/valid-3.expected | 1 -
tests/layouts/valid-4.expected | 1 -
tests/test-common.c | 3 +
tests/testattributes.c | 11 ++-
11 files changed, 277 insertions(+), 133 deletions(-)
---
diff --cc pango/pango-layout.c
index 643f5623,7824a3ce..24444ed4
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@@ -3057,20 -3082,16 +3082,20 @@@ ensure_tab_width (PangoLayout *layout
GList *items;
PangoAttribute *attr;
PangoAttrList *layout_attrs;
- PangoAttrList *tmp_attrs;
- PangoAttrIterator *iter;
+ PangoAttrList tmp_attrs;
+ PangoAttrIterator iter;
PangoFontDescription *font_desc = pango_font_description_copy_static
(pango_context_get_font_description (layout->context));
PangoLanguage *language;
+ PangoShapeFlags shape_flags = PANGO_SHAPE_NONE;
+
+ if (pango_context_get_round_glyph_positions (layout->context))
+ shape_flags |= PANGO_SHAPE_ROUND_POSITIONS;
layout_attrs = pango_layout_get_effective_attributes (layout);
- iter = pango_attr_list_get_iterator (layout_attrs);
- pango_attr_iterator_get_font (iter, font_desc, &language, NULL);
+ _pango_attr_list_get_iterator (layout_attrs, &iter);
+ pango_attr_iterator_get_font (&iter, font_desc, &language, NULL);
- tmp_attrs = pango_attr_list_new ();
+ _pango_attr_list_init (&tmp_attrs);
attr = pango_attr_font_desc_new (font_desc);
pango_font_description_free (font_desc);
@@@ -3090,10 -3111,10 +3115,10 @@@
pango_attr_list_unref (layout_attrs);
layout_attrs = NULL;
}
- pango_attr_list_unref (tmp_attrs);
+ _pango_attr_list_destroy (&tmp_attrs);
item = items->data;
- pango_shape (" ", 8, &item->analysis, glyphs);
+ pango_shape_with_flags (" ", 8, " ", 8, &item->analysis, glyphs, shape_flags);
pango_item_free (item);
g_list_free (items);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]