isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 12:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[text] Return the correct minimum height

Browse Source 
If text is set, ClutterText should never return less than the layout
height for minimum and preferred heights.

This holds unless ellipsize and wrap are enabled, in which case the
minimum height should be the height of the first line -- which is
the height needed to at the very least show the ellipsization.

Based on a patch by: Thomas Wood <thomas@openedhand.com>

Fixes bug:

  http://bugzilla.openedhand.com/show_bug.cgi?id=1598

Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Emmanuele Bassi 2009-05-13 23:04:25 +01:00
parent 2b1759385e
commit 447e04bdce
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
clutter/clutter-text.c
View File

@ -1448,7 +1448,7 @@ clutter_text_get_preferred_height (ClutterActor *self,
ClutterUnit *min_height_p, ClutterUnit *min_height_p,
ClutterUnit *natural_height_p) ClutterUnit *natural_height_p)
{ {
ClutterText *text = CLUTTER_TEXT (self); ClutterTextPrivate *priv = CLUTTER_TEXT (self)->priv;
if (for_width == 0) if (for_width == 0)
{ {
@ -1465,7 +1465,8 @@ clutter_text_get_preferred_height (ClutterActor *self,
gint logical_height; gint logical_height;
ClutterUnit layout_height; ClutterUnit layout_height;
layout = clutter_text_create_layout (text, for_width, -1); layout = clutter_text_create_layout (CLUTTER_TEXT (self),
for_width, -1);
pango_layout_get_extents (layout, NULL, &logical_rect); pango_layout_get_extents (layout, NULL, &logical_rect);
@ -1474,13 +1475,26 @@ clutter_text_get_preferred_height (ClutterActor *self,
* the height accordingly * the height accordingly
*/ */
logical_height = logical_rect.y + logical_rect.height; logical_height = logical_rect.y + logical_rect.height;
layout_height = CLUTTER_UNITS_FROM_PANGO_UNIT (logical_height); layout_height = CLUTTER_UNITS_FROM_PANGO_UNIT (logical_height);
if (min_height_p) if (min_height_p)
{ {
if (text->priv->ellipsize) /* if we wrap and ellipsize then the minimum height is
*min_height_p = 1; * going to be at least the size of the first line
*/
if (priv->ellipsize && priv->wrap)
{
PangoLayoutLine *line;
ClutterUnit line_height;
line = pango_layout_get_line_readonly (layout, 0);
pango_layout_line_get_extents (line, NULL, &logical_rect);
logical_height = logical_rect.y + logical_rect.height;
line_height = CLUTTER_UNITS_FROM_PANGO_UNIT (logical_height);
*min_height_p = line_height;
}
else else
*min_height_p = layout_height; *min_height_p = layout_height;
} }