griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#36656] text editor undo error when undoing paste command

Browse Source 
When tabs to spaces is enabled and a paste command is undone, the improper number of characters could get removed. Also fixed issue with shift + left/right only selecting a max of 1 character.
This commit is contained in:
Justin Dailey
2013-09-05 21:36:19 +00:00
parent 3b72f1824c
commit 89a02fc4ef
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/text.c
View File

@@ -1947,6 +1947,7 @@ static unsigned int txt_redo_read_unicode(const char *undo_buf, int *undo_pos, s
void txt_do_undo(Text *text)
{
int op = text->undo_buf[text->undo_pos];
int prev_flags;
unsigned int linep, i;
unsigned int uchar;
unsigned int curln, selln;
@@ -2070,8 +2071,14 @@ void txt_do_undo(Text *text)
txt_move_to(text, selln, selc, 1);
if ((curln == selln) && (curc == selc)) {
/* disable tabs to spaces since moving right may involve skipping multiple spaces */
prev_flags = text->flags;
text->flags &= ~TXT_TABSTOSPACES;
for (i = 0; i < linep; i++)
txt_move_right(text, 1);
text->flags = prev_flags;
}
txt_delete_selected(text);

4
source/blender/editors/space_text/text_ops.c
View File

@@ -1861,7 +1861,7 @@ static int text_move_cursor(bContext *C, int type, int select)
break;
case PREV_CHAR:
if (txt_has_sel(text)) {
if (txt_has_sel(text) && !select) {
txt_order_cursors(text, false);
txt_pop_sel(text);
}
@@ -1871,7 +1871,7 @@ static int text_move_cursor(bContext *C, int type, int select)
break;
case NEXT_CHAR:
if (txt_has_sel(text)) {
if (txt_has_sel(text) && !select) {
txt_order_cursors(text, true);
txt_pop_sel(text);
}