isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-04 13:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter-text: prevent reset of user set font descriptions on dpi changes

Browse Source 
When setting the font using clutter_text_set_font_description(), the
font settings on a ClutterText actor can be reset when there is a dpi
changes signaled by the backend.

https://bugzilla.gnome.org/show_bug.cgi?id=702016
This commit is contained in:
Lionel Landwerlin 2013-06-11 14:01:30 +01:00
parent 96cc131f70
commit 90243e9d88
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clutter/clutter-text.c
View File

@ -566,10 +566,13 @@ clutter_text_dirty_cache (ClutterText *text)
*/ */
static inline void static inline void
clutter_text_set_font_description_internal (ClutterText *self, clutter_text_set_font_description_internal (ClutterText *self,
PangoFontDescription *desc) PangoFontDescription *desc,
gboolean is_default_font)
{ {
ClutterTextPrivate *priv = self->priv; ClutterTextPrivate *priv = self->priv;
priv->is_default_font = is_default_font;
if (priv->font_desc == desc || if (priv->font_desc == desc ||
pango_font_description_equal (priv->font_desc, desc)) pango_font_description_equal (priv->font_desc, desc))
return; return;
@ -617,7 +620,7 @@ clutter_text_settings_changed_cb (ClutterText *text)
font_name); font_name);
font_desc = pango_font_description_from_string (font_name); font_desc = pango_font_description_from_string (font_name);
clutter_text_set_font_description_internal (text, font_desc); clutter_text_set_font_description_internal (text, font_desc, TRUE);
pango_font_description_free (font_desc); pango_font_description_free (font_desc);
g_free (font_name); g_free (font_name);
@ -4818,7 +4821,8 @@ clutter_text_set_font_description (ClutterText *self,
{ {
g_return_if_fail (CLUTTER_IS_TEXT (self)); g_return_if_fail (CLUTTER_IS_TEXT (self));
clutter_text_set_font_description_internal (self, font_desc); clutter_text_set_font_description_internal (self, font_desc,
font_desc == NULL);
} }
/** /**
@ -4925,8 +4929,7 @@ clutter_text_set_font_name (ClutterText *self,
} }
/* this will set the font_name field as well */ /* this will set the font_name field as well */
clutter_text_set_font_description_internal (self, desc); clutter_text_set_font_description_internal (self, desc, is_default_font);
priv->is_default_font = is_default_font;
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_NAME]); g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_NAME]);