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

text: Layouts for single-line-mode entries are boundless

Browse Source 
A PangoLayout for an editable, single-line text entry is by definition
without a given width, since the actor will be clipped when being drawn.
This commit is contained in:
Emmanuele Bassi 2010-07-09 18:37:34 +01:00
parent 1635a2db12
commit 903560c6c8
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clutter/clutter-text.c
View File

@ -1819,9 +1819,13 @@ clutter_text_paint (ClutterActor *self)
} }
clutter_actor_get_allocation_box (self, &alloc); clutter_actor_get_allocation_box (self, &alloc);
layout = clutter_text_create_layout (text,
alloc.x2 - alloc.x1, if (priv->editable && priv->single_line_mode)
alloc.y2 - alloc.y1); layout = clutter_text_create_layout (text, -1, -1);
else
layout = clutter_text_create_layout (text,
alloc.x2 - alloc.x1,
alloc.y2 - alloc.y1);
if (priv->editable && priv->cursor_visible) if (priv->editable && priv->cursor_visible)
clutter_text_ensure_cursor_position (text); clutter_text_ensure_cursor_position (text);
@ -2016,10 +2020,17 @@ clutter_text_allocate (ClutterActor *self,
/* Ensure that there is a cached layout with the right width so /* Ensure that there is a cached layout with the right width so
* that we don't need to create the text during the paint run * that we don't need to create the text during the paint run
*
* if the Text is editable and in single line mode we don't want
* to have any limit on the layout size, since the paint will clip
* it to the allocation of the actor
*/ */
clutter_text_create_layout (text, if (text->priv->editable && text->priv->single_line_mode)
box->x2 - box->x1, clutter_text_create_layout (text, -1, -1);
box->y2 - box->y1); else
clutter_text_create_layout (text,
box->x2 - box->x1,
box->y2 - box->y1);
parent_class = CLUTTER_ACTOR_CLASS (clutter_text_parent_class); parent_class = CLUTTER_ACTOR_CLASS (clutter_text_parent_class);
parent_class->allocate (self, box, flags); parent_class->allocate (self, box, flags);
@ -3953,6 +3964,9 @@ clutter_text_get_layout (ClutterText *self)
g_return_val_if_fail (CLUTTER_IS_TEXT (self), NULL); g_return_val_if_fail (CLUTTER_IS_TEXT (self), NULL);
if (self->priv->editable && self->priv->single_line_mode)
return clutter_text_create_layout (self, -1, -1);
clutter_actor_get_size (CLUTTER_ACTOR (self), &width, &height); clutter_actor_get_size (CLUTTER_ACTOR (self), &width, &height);
return clutter_text_create_layout (self, width, height); return clutter_text_create_layout (self, width, height);