diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-11-01 09:15:24 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-11-01 13:01:54 -0400 |
| commit | 828b58247ca09c36e93d003567fd8c12e83f4b24 (patch) | |
| tree | d2166c744784cf0e76ebeffc917a0345cd105142 | |
| parent | de29c3e1934f3bf7a90030a961755edb141384a9 (diff) | |
| download | gtk+-828b58247ca09c36e93d003567fd8c12e83f4b24.tar.gz | |
label: Handle new pango attributes
overline and overline-color were introduced in Pango 1.45.
| -rw-r--r-- | gtk/gtklabel.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 7ff59dc505..def048a7db 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -1550,13 +1550,26 @@ attribute_from_text (GtkBuilder *builder, 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; -#endif -#if PANGO_VERSION_CHECK(1,44,4) case PANGO_ATTR_INSERT_HYPHENS: if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error)) attribute = pango_attr_insert_hyphens_new (g_value_get_boolean (&val)); break; #endif +#if PANGO_VERSION_CHECK(1,45,0) + case PANGO_ATTR_OVERLINE: + if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_OVERLINE, value, &val, NULL)) + attribute = pango_attr_overline_new (g_value_get_enum (&val)); + break; + case PANGO_ATTR_OVERLINE_COLOR: + if (gtk_builder_value_from_string_type (builder, GDK_TYPE_RGBA, value, &val, error)) + { + color = g_value_get_boxed (&val); + attribute = pango_attr_overline_color_new (color->red * 65535, + color->green * 65535, + color->blue * 65535); + } + break; +#endif case PANGO_ATTR_INVALID: default: break; |