Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-05-07 05:00:19 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-05-07 05:00:19 +0400
commitc31ec62d2f5b33c46d54ddc982c0aed305c56a29 (patch)
treeaf033e09f91dcf2ad266ea3af335c221409c4cee /source/blender
parent0ffde4fae3bd6a62302d829d319955b012a9b73a (diff)
fix for glitch in text editor using ctrl+(backspace / delete),
for now just don't jump words when theres a selection.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/space_text/text_ops.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index 30f3c1623c9..7b258e0eafb 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -2006,10 +2006,18 @@ static EnumPropertyItem delete_type_items[] = {
static int text_delete_exec(bContext *C, wmOperator *op)
{
+ SpaceText *st = CTX_wm_space_text(C);
Text *text = CTX_data_edit_text(C);
int type = RNA_enum_get(op->ptr, "type");
- text_drawcache_tag_update(CTX_wm_space_text(C), 0);
+ text_drawcache_tag_update(st, 0);
+
+ /* behavior could be changed here,
+ * but for now just don't jump words when we have a selection */
+ if (txt_has_sel(text)) {
+ if (type == DEL_PREV_WORD) type = DEL_PREV_CHAR;
+ else if (type == DEL_NEXT_WORD) type = DEL_NEXT_CHAR;
+ }
if (type == DEL_PREV_WORD) {
if (txt_cursor_is_line_start(text)) {
@@ -2036,7 +2044,7 @@ static int text_delete_exec(bContext *C, wmOperator *op)
WM_event_add_notifier(C, NC_TEXT | NA_EDITED, text);
/* run the script while editing, evil but useful */
- if (CTX_wm_space_text(C)->live_edit)
+ if (st->live_edit)
text_run_script(C, NULL);
return OPERATOR_FINISHED;