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

2008-08-26 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
Bug 1090 - Label somtimes returns natural_width < min_width

	* clutter/clutter-label.c:
	(clutter_label_get_preferred_width): Check that the width of the
	layout is always greater than 0. (Johan Bilien)
This commit is contained in:
Emmanuele Bassi 2008-08-26 12:57:04 +00:00
parent 607503ca43
commit d03ad3dd41
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-08-26 Emmanuele Bassi <ebassi@openedhand.com>
Bug 1090 - Label somtimes returns natural_width < min_width
* clutter/clutter-label.c:
(clutter_label_get_preferred_width): Check that the width of the
layout is always greater than 0. (Johan Bilien)
2008-08-19 Neil Roberts <neil@o-hand.com> 2008-08-19 Neil Roberts <neil@o-hand.com>
Bug 1103 - Two typos in clutter documentation Bug 1103 - Two typos in clutter documentation

9
clutter/clutter-label.c
View File

@ -245,6 +245,7 @@ clutter_label_get_preferred_width (ClutterActor *self,
ClutterLabelPrivate *priv = label->priv; ClutterLabelPrivate *priv = label->priv;
PangoRectangle logical_rect = { 0, }; PangoRectangle logical_rect = { 0, };
PangoLayout *layout; PangoLayout *layout;
ClutterUnit layout_width;
/* we create a layout to compute the width request; we ignore the /* we create a layout to compute the width request; we ignore the
* passed height because ClutterLabel is a height-for-width actor * passed height because ClutterLabel is a height-for-width actor
@ -256,16 +257,20 @@ clutter_label_get_preferred_width (ClutterActor *self,
pango_layout_get_extents (layout, NULL, &logical_rect); pango_layout_get_extents (layout, NULL, &logical_rect);
layout_width = logical_rect.width > 0
? CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.width)
: 1;
if (min_width_p) if (min_width_p)
{ {
if (priv->wrap || priv->ellipsize) if (priv->wrap || priv->ellipsize)
*min_width_p = 1; *min_width_p = 1;
else else
*min_width_p = CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.width); *min_width_p = layout_width;
} }
if (natural_width_p) if (natural_width_p)
*natural_width_p = CLUTTER_UNITS_FROM_PANGO_UNIT (logical_rect.width); *natural_width_p = layout_width;
g_object_unref (layout); g_object_unref (layout);
} }