brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter/text: Add utility function to set the pango attributes

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/3
This commit is contained in:
Marco Trevisan (Treviño) 2018-06-12 02:56:12 +02:00 committed by Marco Trevisan
parent 02813d74e1
commit 9234777e36
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
clutter/clutter/clutter-text.c
View File

@ -550,6 +550,26 @@ clutter_text_get_display_text (ClutterText *self)
} }
} }
static void
set_effective_pango_attributes (ClutterText *self,
PangoAttrList *attributes)
{
ClutterTextPrivate *priv = self->priv;
if (attributes != NULL)
{
PangoAttrList *old_attributes = priv->effective_attrs;
priv->effective_attrs = pango_attr_list_ref (attributes);
if (old_attributes != NULL)
pango_attr_list_unref (old_attributes);
}
else
{
g_clear_pointer (&priv->effective_attrs, pango_attr_list_unref);
}
}
static inline void static inline void
clutter_text_ensure_effective_attributes (ClutterText *self) clutter_text_ensure_effective_attributes (ClutterText *self)
{ {
@ -563,21 +583,25 @@ clutter_text_ensure_effective_attributes (ClutterText *self)
/* Same as if we don't have any attribute at all. /* Same as if we don't have any attribute at all.
* We also ignore markup attributes for editable. */ * We also ignore markup attributes for editable. */
if (priv->attrs == NULL && (priv->editable || priv->markup_attrs == NULL)) if (priv->attrs == NULL && (priv->editable || priv->markup_attrs == NULL))
return; {
set_effective_pango_attributes (self, NULL);
return;
}
if (priv->attrs != NULL) if (priv->attrs != NULL)
{ {
/* If there are no markup attributes, or if this is editable (in which /* If there are no markup attributes, or if this is editable (in which
* case we ignore markup), then we can just use these attrs directly */ * case we ignore markup), then we can just use these attrs directly */
if (priv->editable || priv->markup_attrs == NULL) if (priv->editable || priv->markup_attrs == NULL)
priv->effective_attrs = pango_attr_list_ref (priv->attrs); set_effective_pango_attributes (self, priv->attrs);
else else
{ {
/* Otherwise we need to merge the two lists */ /* Otherwise we need to merge the two lists */
PangoAttrList *effective_attrs;
PangoAttrIterator *iter; PangoAttrIterator *iter;
GSList *attributes, *l; GSList *attributes, *l;
priv->effective_attrs = pango_attr_list_copy (priv->markup_attrs); effective_attrs = pango_attr_list_copy (priv->markup_attrs);
iter = pango_attr_list_get_iterator (priv->attrs); iter = pango_attr_list_get_iterator (priv->attrs);
do do
@ -588,7 +612,7 @@ clutter_text_ensure_effective_attributes (ClutterText *self)
{ {
PangoAttribute *attr = l->data; PangoAttribute *attr = l->data;
pango_attr_list_insert (priv->effective_attrs, attr); pango_attr_list_insert (effective_attrs, attr);
} }
g_slist_free (attributes); g_slist_free (attributes);
@ -596,12 +620,14 @@ clutter_text_ensure_effective_attributes (ClutterText *self)
while (pango_attr_iterator_next (iter)); while (pango_attr_iterator_next (iter));
pango_attr_iterator_destroy (iter); pango_attr_iterator_destroy (iter);
set_effective_pango_attributes (self, effective_attrs);
pango_attr_list_unref (effective_attrs);
} }
} }
else if (priv->markup_attrs != NULL) else if (priv->markup_attrs != NULL)
{ {
/* We can just use the markup attributes directly */ set_effective_pango_attributes (self, priv->markup_attrs);
priv->effective_attrs = pango_attr_list_ref (priv->markup_attrs);
} }
} }