blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 750 Projects 19 Wiki Activity

WIP: VFONT: Text Object Word Selection #107519

Closed
Harley Acheson wants to merge 2 commits from Harley:TextWordSelect into main
pull from: Harley:TextWordSelect
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 4 Commits 2 Files Changed 1 +17 -4
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/editors/curve/editfont.c
View File

@ -1202,8 +1202,10 @@ static int move_cursor(bContext *C, int type, const bool select)
case PREV_WORD: {
int pos = ef->pos;
/* Only use_init_step if there is space to the left. */
bool space_left = pos > 0 && ELEM(ef->textbuf[pos - 1], ' ', '\n', '\t');
BLI_str_cursor_step_utf32(
ef->textbuf, ef->len, &pos, STRCUR_DIR_PREV, STRCUR_JUMP_DELIM, true);
ef->textbuf, ef->len, &pos, STRCUR_DIR_PREV, STRCUR_JUMP_DELIM, space_left);
ef->pos = pos;
cursmove = FO_CURS;
break;
@ -1211,8 +1213,10 @@ static int move_cursor(bContext *C, int type, const bool select)
case NEXT_WORD: {
int pos = ef->pos;
/* Only use_init_step if there is space to the right. */
bool space_right = ELEM(ef->textbuf[pos], ' ', '\n', '\t');
BLI_str_cursor_step_utf32(
ef->textbuf, ef->len, &pos, STRCUR_DIR_NEXT, STRCUR_JUMP_DELIM, true);
ef->textbuf, ef->len, &pos, STRCUR_DIR_NEXT, STRCUR_JUMP_DELIM, space_right);
ef->pos = pos;
cursmove = FO_CURS;
break;
@ -1921,9 +1925,18 @@ void FONT_OT_selection_set(struct wmOperatorType *ot)
static int font_select_word_exec(bContext *C, wmOperator *UNUSED(op))
{
move_cursor(C, NEXT_CHAR, false);
move_cursor(C, PREV_WORD, false);
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
Object *obedit = CTX_data_edit_object(C);
Curve *cu = obedit->data;
EditFont *ef = cu->editfont;
if (ef->pos > 0 && !ELEM(ef->textbuf[ef->pos - 1], ' ', '\n', '\t')) {
/* We are at the end or middle of a word, so move back. */
move_cursor(C, PREV_WORD, false);
}
move_cursor(C, NEXT_WORD, true);
return OPERATOR_FINISHED;
}