isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-09 03:39:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[text] account for scrolling in clutter_text_position_to_coords

Browse Source 
Add any scrolling offset to the x value when in single line mode.

Now that the offset is taken into account in the position_to_coords
function, we do not need to adjust the cursor x manually in
clutter_text_paint.
This commit is contained in:
Thomas Wood 2009-05-14 10:53:44 +01:00
parent 16185c78fc
commit e79fd1055d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter-text.c
View File

@ -535,6 +535,15 @@ clutter_text_position_to_coords (ClutterText *self,
if (line_height) if (line_height)
*line_height = CLUTTER_UNITS_FROM_PANGO_UNIT (rect.height); *line_height = CLUTTER_UNITS_FROM_PANGO_UNIT (rect.height);
if (self->priv->single_line_mode)
{
/* Take any offset due to scrolling into account */
if (x)
*x += self->priv->text_x;
}
/* FIXME: should return false if coords were outside text */ /* FIXME: should return false if coords were outside text */
return TRUE; return TRUE;
} }
@ -1380,7 +1389,6 @@ clutter_text_paint (ClutterActor *self)
{ {
text_x = TEXT_PADDING; text_x = TEXT_PADDING;
} }
priv->cursor_pos.x += text_x;
} }
else else
text_x = 0; text_x = 0;