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

[text] move_word_backward/forward fixes

Browse Source 
clutter_text_move_word_backward/forward() calls did not use the
start argument consistently. Also, clutter_text_move_word_forward()
bound check checked the wrong end.

Fixes #1765

Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Jussi Kukkonen 2009-08-17 00:00:35 +03:00 committed by Emmanuele Bassi
parent 99437c4761
commit 8c00d705c0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clutter/clutter-text.c
View File

@ -1041,7 +1041,7 @@ clutter_text_move_word_forward (ClutterText *self,
ClutterTextPrivate *priv = self->priv; ClutterTextPrivate *priv = self->priv;
gint retval = start; gint retval = start;
if (priv->text && start > 0) if (priv->text && start < priv->n_chars)
{ {
PangoLayout *layout = clutter_text_get_layout (self); PangoLayout *layout = clutter_text_get_layout (self);
PangoLogAttr *log_attrs = NULL; PangoLogAttr *log_attrs = NULL;
@ -1049,8 +1049,8 @@ clutter_text_move_word_forward (ClutterText *self,
pango_layout_get_log_attrs (layout, &log_attrs, &n_attrs); pango_layout_get_log_attrs (layout, &log_attrs, &n_attrs);
retval = start; retval = start + 1;
while (retval > 0 && !log_attrs[retval].is_word_end) while (retval < priv->n_chars && !log_attrs[retval].is_word_end)
retval += 1; retval += 1;
g_free (log_attrs); g_free (log_attrs);
@ -1588,9 +1588,9 @@ clutter_text_real_move_left (ClutterText *self,
if (modifiers & CLUTTER_CONTROL_MASK) if (modifiers & CLUTTER_CONTROL_MASK)
{ {
if (pos == -1) if (pos == -1)
new_pos = clutter_text_move_word_backward (self, len - 1); new_pos = clutter_text_move_word_backward (self, len);
else else
new_pos = clutter_text_move_word_backward (self, pos - 1); new_pos = clutter_text_move_word_backward (self, pos);
} }
else else
{ {
@ -1627,7 +1627,7 @@ clutter_text_real_move_right (ClutterText *self,
if (modifiers & CLUTTER_CONTROL_MASK) if (modifiers & CLUTTER_CONTROL_MASK)
{ {
if (pos != len) if (pos != len)
new_pos = clutter_text_move_word_forward (self, pos + 1); new_pos = clutter_text_move_word_forward (self, pos);
} }
else else
{ {