callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pango: move an utility function from gtklabel

Browse Source 
This will be used both by gtklabel and gtkentry
This commit is contained in:
Paolo Borelli
2015-07-05 22:48:16 +02:00
parent 3175d0fcf0
commit b92c530a61
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtklabel.c
View File

@ -2145,21 +2145,6 @@ gtk_label_set_use_underline_internal (GtkLabel *label,
}
}
static gboolean
my_pango_attr_list_merge_filter (PangoAttribute *attribute,
gpointer list)
{
pango_attr_list_change (list, pango_attribute_copy (attribute));
return FALSE;
}
static void
my_pango_attr_list_merge (PangoAttrList *into,
PangoAttrList *from)
{
pango_attr_list_filter (from, my_pango_attr_list_merge_filter, into);
}
/* Calculates text, attrs and mnemonic_keyval from
* label, use_underline and use_markup
*/
@ -3480,7 +3465,7 @@ gtk_label_update_layout_attributes (GtkLabel *label)
if (priv->markup_attrs)
{
if (attrs)
my_pango_attr_list_merge (attrs, priv->markup_attrs);
_gtk_pango_attr_list_merge (attrs, priv->markup_attrs);
else
attrs = pango_attr_list_ref (priv->markup_attrs);
}
@ -3488,7 +3473,7 @@ gtk_label_update_layout_attributes (GtkLabel *label)
if (priv->attrs)
{
if (attrs)
my_pango_attr_list_merge (attrs, priv->attrs);
_gtk_pango_attr_list_merge (attrs, priv->attrs);
else
attrs = pango_attr_list_ref (priv->attrs);
}