* clutter/clutter-label.c: (clutter_label_ensure_layout): avoid
calling pango_layout_set_text|markup before we've got any text.
This commit is contained in:
parent
7d7d235729
commit
f7a426587c
@ -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>
|
||||
|
||||
* tests/test-scale.c:
|
||||
|
@ -224,11 +224,14 @@ clutter_label_ensure_layout (ClutterLabel *label,
|
||||
priv->single_line_mode);
|
||||
|
||||
pango_layout_set_font_description (priv->layout, priv->desc);
|
||||
|
||||
if (!priv->use_markup)
|
||||
pango_layout_set_text (priv->layout, priv->text, -1);
|
||||
else
|
||||
pango_layout_set_markup (priv->layout, priv->text, -1);
|
||||
|
||||
if (priv->text)
|
||||
{
|
||||
if (!priv->use_markup)
|
||||
pango_layout_set_text (priv->layout, priv->text, -1);
|
||||
else
|
||||
pango_layout_set_markup (priv->layout, priv->text, -1);
|
||||
}
|
||||
|
||||
if (priv->wrap)
|
||||
pango_layout_set_wrap (priv->layout, priv->wrap_mode);
|
||||
|
Loading…
Reference in New Issue
Block a user