aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table
diff options
context:
space:
mode:
authorTheppitak Karoonboonyanan <theppitak@gmail.com>2005-03-14 14:34:27 +0800
committerMichael Zucci <zucchi@src.gnome.org>2005-03-14 14:34:27 +0800
commitc66108e0fcd6b4fc23eb00aa48f08881e1c89599 (patch)
treeb7638cff61b15724f58c3d501781befe45e0ee1a /widgets/table
parent455c6c30f744af5f5ddeeddc8dce8a0e3f6ce294 (diff)
downloadgsoc2013-evolution-c66108e0fcd6b4fc23eb00aa48f08881e1c89599.tar
gsoc2013-evolution-c66108e0fcd6b4fc23eb00aa48f08881e1c89599.tar.gz
gsoc2013-evolution-c66108e0fcd6b4fc23eb00aa48f08881e1c89599.tar.bz2
gsoc2013-evolution-c66108e0fcd6b4fc23eb00aa48f08881e1c89599.tar.lz
gsoc2013-evolution-c66108e0fcd6b4fc23eb00aa48f08881e1c89599.tar.xz
gsoc2013-evolution-c66108e0fcd6b4fc23eb00aa48f08881e1c89599.tar.zst
gsoc2013-evolution-c66108e0fcd6b4fc23eb00aa48f08881e1c89599.zip
selecion fixes for im's.
2005-03-14 Theppitak Karoonboonyanan <theppitak@gmail.com> * e-cell-text.c (e_cell_text_retrieve_surrounding_cb) (e_cell_text_delete_surrounding_cb): selecion fixes for im's. svn path=/trunk/; revision=29007
Diffstat (limited to 'widgets/table')
-rw-r--r--widgets/table/e-cell-text.c25
1 files changed, 18 insertions, 7 deletions
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index cbc0fddca8..00292254e9 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -1830,15 +1830,12 @@ static gboolean
e_cell_text_retrieve_surrounding_cb (GtkIMContext *context,
ECellTextView *tv)
{
- int cur_pos = 0;
CellEdit *edit = tv->edit;
- cur_pos = g_utf8_pointer_to_offset (edit->text, edit->text + edit->selection_start);
-
gtk_im_context_set_surrounding (context,
edit->text,
strlen (edit->text),
- cur_pos
+ MIN (edit->selection_start, edit->selection_end)
);
return TRUE;
@@ -1850,11 +1847,25 @@ e_cell_text_delete_surrounding_cb (GtkIMContext *context,
gint n_chars,
ECellTextView *tv)
{
+ int begin_pos, end_pos;
+ glong text_len;
CellEdit *edit = tv->edit;
- gtk_editable_delete_text (GTK_EDITABLE (edit),
- edit->selection_end + offset,
- edit->selection_end + offset + n_chars);
+ text_len = g_utf8_strlen (edit->text, -1);
+ begin_pos = g_utf8_pointer_to_offset (edit->text,
+ edit->text + MIN (edit->selection_start, edit->selection_end));
+ begin_pos += offset;
+ end_pos = begin_pos + n_chars;
+ if(begin_pos < 0 || text_len < begin_pos)
+ return FALSE;
+ if(end_pos > text_len)
+ end_pos = text_len;
+ edit->selection_start = g_utf8_offset_to_pointer (edit->text, begin_pos)
+ - edit->text;
+ edit->selection_end = g_utf8_offset_to_pointer (edit->text, end_pos)
+ - edit->text;
+
+ _delete_selection (tv);
return TRUE;
}