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

2008-01-09 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-label.c:
	(clutter_label_ensure_layout): Fix the ClutterUnits to Pango
	scale conversion.
This commit is contained in:
Emmanuele Bassi 2008-01-09 11:00:54 +00:00
parent 6fdeda0e8f
commit a6c7ce7117
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-01-09 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-label.c:
(clutter_label_ensure_layout): Fix the ClutterUnits to Pango
scale conversion.
2008-01-08 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-model.c:

8
clutter/clutter-label.c
View File

@ -198,8 +198,8 @@ clutter_label_ensure_layout (ClutterLabel *label)
}
if (priv->ellipsize != PANGO_ELLIPSIZE_NONE)
pango_layout_set_width (priv->layout, width > 0 ? CLUTTER_UNITS_TO_PANGO_UNIT (raw_width)
: -1);
pango_layout_set_width (priv->layout, raw_width > 0 ? CLUTTER_UNITS_TO_PANGO_UNIT (raw_width)
: -1);
else if (priv->wrap)
{
pango_layout_set_wrap (priv->layout, priv->wrap_mode);
@ -266,8 +266,8 @@ clutter_label_ensure_layout (ClutterLabel *label)
}
}
else
pango_layout_set_width (priv->layout, width > 0 ? CLUTTER_UNITS_FROM_PANGO_UNIT (raw_width)
: -1);
pango_layout_set_width (priv->layout, raw_width > 0 ? CLUTTER_UNITS_TO_PANGO_UNIT (raw_width)
: -1);
}
CLUTTER_NOTE (ACTOR, "Label width set to %d pixels", width);