[gtk+] label: Flesh out pango attribute support
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] label: Flesh out pango attribute support
- Date: Wed, 12 Aug 2015 00:59:09 +0000 (UTC)
commit 12e98498f6aa687a07034d9c054d20a2f74159e4
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Aug 11 20:57:52 2015 -0400
label: Flesh out pango attribute support
A few attribute types were missing from the support:
rise, letterspacing, fallback, font features. Add support
for these.
gtk/gtklabel.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index f3ab485..592d8ba 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1526,11 +1526,22 @@ G_GNUC_END_IGNORE_DEPRECATIONS
if (gtk_builder_value_from_string_type (builder, G_TYPE_DOUBLE, value, &val, error))
attribute = pango_attr_scale_new (g_value_get_double (&val));
break;
-
- case PANGO_ATTR_INVALID:
case PANGO_ATTR_LETTER_SPACING:
+ if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, value, &val, error))
+ attribute = pango_attr_letter_spacing_new (g_value_get_int (&val));
+ break;
case PANGO_ATTR_RISE:
+ if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, value, &val, error))
+ attribute = pango_attr_rise_new (g_value_get_int (&val));
+ break;
case PANGO_ATTR_FALLBACK:
+ if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error))
+ attribute = pango_attr_fallback_new (g_value_get_boolean (&val));
+ break;
+ case PANGO_ATTR_FONT_FEATURES:
+ attribute = pango_attr_font_features_new (value);
+ break;
+ case PANGO_ATTR_INVALID:
default:
break;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]