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

2008-09-23 Emmanuele Bassi <ebassi@linux.intel.com>

Browse Source 
Bug 1125 - Save an extra pango_layout_get_size in many cases

	* clutter/clutter-label.c:
	(clutter_label_create_layout_no_cache): Add a simple check
	before calling pango_layout_get_size(). (Johan Bilien)
This commit is contained in:
Emmanuele Bassi 2008-09-23 11:11:14 +00:00
parent 73adac987d
commit 9f0842bacb
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-09-23 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1125 - Save an extra pango_layout_get_size in many cases
* clutter/clutter-label.c:
(clutter_label_create_layout_no_cache): Add a simple check
before calling pango_layout_get_size(). (Johan Bilien)
2008-09-23 Emmanuele Bassi <ebassi@linux.intel.com>
* clutter/clutter-alpha.c:

3
clutter/clutter-label.c
View File

@ -154,7 +154,8 @@ clutter_label_create_layout_no_cache (ClutterLabel *label,
pango_layout_set_markup (layout, priv->text, -1);
}
if (allocation_width > 0)
if (allocation_width > 0 &&
(priv->ellipsize != PANGO_ELLIPSIZE_NONE || priv->wrap))
{
int layout_width, layout_height;