summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-07-11 18:52:15 +0000
committerMatthias Clasen <mclasen@redhat.com>2019-07-11 18:52:15 +0000
commite445b8978ea73ab60f5462af4403987d73300a1f (patch)
tree10c5059dc27cf173c2f06b597fa09dd6d04b31f0
parent482c7d75ec0b228dffc4c8522a3b8666cc5aff61 (diff)
parenta8c2e5713ed8e7d0a4eb467bad2f4eeef78d9b26 (diff)
downloadpango-e445b8978ea73ab60f5462af4403987d73300a1f.tar.gz
Merge branch 'no-shape-alpha' into 'master'
Leave some more attributes out of shaping See merge request GNOME/pango!80
-rw-r--r--pango/pango-layout.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 2b07954e..2384d6b0 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -4001,6 +4001,8 @@ no_shape_filter_func (PangoAttribute *attribute,
static const PangoAttrType no_shape_types[] = {
PANGO_ATTR_FOREGROUND,
PANGO_ATTR_BACKGROUND,
+ PANGO_ATTR_FOREGROUND_ALPHA,
+ PANGO_ATTR_BACKGROUND_ALPHA,
PANGO_ATTR_UNDERLINE,
PANGO_ATTR_STRIKETHROUGH,
PANGO_ATTR_RISE