isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

* clutter/clutter-label.c: (clutter_label_ensure_layout): avoid

Browse Source 
calling pango_layout_set_text|markup before we've got any text.
This commit is contained in:
Øyvind Kolås 2007-09-28 10:54:42 +00:00
parent 7d7d235729
commit f7a426587c
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-09-28 Øyvind Kolås <pippin@openedhand.com>
* clutter/clutter-label.c: (clutter_label_ensure_layout): avoid
calling pango_layout_set_text|markup before we've got any text.
2007-09-27 Matthew Allum <mallum@openedhand.com> 2007-09-27 Matthew Allum <mallum@openedhand.com>
* tests/test-scale.c: * tests/test-scale.c:

13
clutter/clutter-label.c
View File

@ -224,11 +224,14 @@ clutter_label_ensure_layout (ClutterLabel *label,
priv->single_line_mode); priv->single_line_mode);
pango_layout_set_font_description (priv->layout, priv->desc); pango_layout_set_font_description (priv->layout, priv->desc);
if (!priv->use_markup) if (priv->text)
pango_layout_set_text (priv->layout, priv->text, -1); {
else if (!priv->use_markup)
pango_layout_set_markup (priv->layout, priv->text, -1); pango_layout_set_text (priv->layout, priv->text, -1);
else
pango_layout_set_markup (priv->layout, priv->text, -1);
}
if (priv->wrap) if (priv->wrap)
pango_layout_set_wrap (priv->layout, priv->wrap_mode); pango_layout_set_wrap (priv->layout, priv->wrap_mode);