blender
/
blender
135
425
Fork 607
Code Issues 6.2k Pull Requests 778 Projects 19 Wiki Activity

UI: Unit completion hint when text editing #116103

Open
Falk David wants to merge 9 commits from filedescriptor/blender:ui-unit-text-completion into main
pull from: filedescriptor/blender:ui-unit-text-completion
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 17 Commits 9 Files Changed 18 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5fb4003dff - Show all commits

5
source/blender/editors/interface/interface_widgets.cc
View File

@ -1850,6 +1850,7 @@ static void widget_draw_text(const uiFontStyle *fstyle,
const char *drawstr_right = nullptr;
bool use_right_only = false;
const char *indeterminate_str = UI_VALUE_INDETERMINATE_CHAR;
const char *completion = ui_but_completion_get(but);
#ifdef WITH_INPUT_IME
const wmIMEData *ime_data;
@ -1874,6 +1875,7 @@ static void widget_draw_text(const uiFontStyle *fstyle,
uiBut *but_edit = ui_but_drag_multi_edit_get(but);
if (but_edit) {
drawstr = but_edit->editstr;
completion = but_edit->completion;
align = UI_STYLE_TEXT_LEFT;
}
}
@ -2179,8 +2181,7 @@ static void widget_draw_text(const uiFontStyle *fstyle,
}
}
const char *completion = ui_but_completion_get(but);
if (ui_but_is_editing(but) && completion && completion[0]) {
if (completion && completion[0] != '\0' && drawstr[0] != '\0') {
rcti text_bounds;
BLF_boundbox(fstyle->uifont_id, drawstr + but->ofs, drawlen, &text_bounds);