mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

editor: Delete selected text before adding new

Browse Source 
When inserting new text, delete selected text first.
This commit is contained in:
Jan Arne Petersen
2012-09-17 15:28:09 +02:00
committed by Kristian Høgsberg
parent 633c83de2c
commit e386dd22c4
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/editor.c
+17
View File
@@ -214,6 +214,7 @@ static void text_entry_set_preedit(struct text_entry *entry,
int preedit_cursor);
static void text_entry_delete_text(struct text_entry *entry,
uint32_t index, uint32_t length);
static void text_entry_delete_selected_text(struct text_entry *entry);
static void
text_model_commit_string(void *data,
@@ -228,6 +229,7 @@ text_model_commit_string(void *data,
index = strlen(text);
}
text_entry_delete_selected_text(entry);
text_entry_insert_at_cursor(entry, text);
widget_schedule_redraw(entry->widget);
@@ -246,6 +248,7 @@ text_model_preedit_string(void *data,
index = strlen(text);
}
text_entry_delete_selected_text(entry);
text_entry_set_preedit(entry, text, index);
widget_schedule_redraw(entry->widget);
@@ -596,6 +599,20 @@ text_entry_delete_text(struct text_entry *entry,
widget_schedule_redraw(entry->widget);
}
static void
text_entry_delete_selected_text(struct text_entry *entry)
{
uint32_t start_index = entry->anchor < entry->cursor ? entry->anchor : entry->cursor;
uint32_t end_index = entry->anchor < entry->cursor ? entry->cursor : entry->anchor;
if (entry->anchor == entry->cursor)
return;
text_entry_delete_text(entry, start_index, end_index - start_index);
entry->anchor = entry->cursor;
}
static void
text_entry_draw_selection(struct text_entry *entry, cairo_t *cr)
{