diff options
author | Matthias Clasen <mclasen@redhat.com> | 2019-07-27 00:02:08 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2019-07-27 00:02:08 -0400 |
commit | f1c7803f800588e4716b448d62feb2aef82470ca (patch) | |
tree | 4d6a27b43f2c33254f8f29fb51fa25e37f6d7049 | |
parent | c179fce6c7a3e8f23854d6c0f93211b8f8450a51 (diff) | |
download | gtk+-f1c7803f800588e4716b448d62feb2aef82470ca.tar.gz |
label: Parse new pango attributes
Support allow-breaks and show attributes.
These will be in pango 1.44
-rw-r--r-- | gtk/gtklabel.c | 8 | ||||
-rw-r--r-- | testsuite/gtk/ui/label1.ui | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 6c867eed71..c82d01eead 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -1543,6 +1543,14 @@ attribute_from_text (GtkBuilder *builder, if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, value, &val, error)) attribute = pango_attr_background_alpha_new ((guint16)g_value_get_int (&val)); break; + case PANGO_ATTR_ALLOW_BREAKS: + if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error)) + attribute = pango_attr_allow_breaks_new (g_value_get_boolean (&val)); + break; + case PANGO_ATTR_SHOW: + if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_SHOW_FLAGS, value, &val, error)) + attribute = pango_attr_show_new (g_value_get_flags (&val)); + break; case PANGO_ATTR_INVALID: default: break; diff --git a/testsuite/gtk/ui/label1.ui b/testsuite/gtk/ui/label1.ui index e83b2dd60b..5880714f17 100644 --- a/testsuite/gtk/ui/label1.ui +++ b/testsuite/gtk/ui/label1.ui @@ -20,6 +20,8 @@ <attribute name="underline-color" value="green"/> <attribute name="strikethrough-color" value="purple"/> <attribute name="scale" value="1.5"/> + <attribute name="allow-breaks" value="true"/> + <attribute name="show" value="spaces|line-breaks"/> </attributes> </object> </interface> |