archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix narrow text entry fields

Browse Source 
widget_draw_text was calculating wrong display length when field is too narrow to show entire input string. Gawain assert caught this 11 function calls away!

Thanks to @ianwill for reporting.
This commit is contained in:
Mike Erwin
2016-10-18 17:34:29 -04:00
parent 117af2356a
commit e9268abf4a
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/interface/interface_widgets.c
View File

@@ -1461,14 +1461,16 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
/* for underline drawing */ /* for underline drawing */
float font_xofs, font_yofs; float font_xofs, font_yofs;
UI_fontstyle_draw_ex(fstyle, rect, drawstr + but->ofs, int drawlen = (drawstr_left_len == INT_MAX) ? strlen(drawstr + but->ofs) : (drawstr_left_len - but->ofs);
drawstr_left_len - but->ofs, &font_xofs, &font_yofs);
if (drawlen > 0) {
UI_fontstyle_draw_ex(fstyle, rect, drawstr + but->ofs, drawlen, &font_xofs, &font_yofs);
if (but->menu_key != '\0') { if (but->menu_key != '\0') {
char fixedbuf[128]; char fixedbuf[128];
const char *str; const char *str;
BLI_strncpy(fixedbuf, drawstr + but->ofs, min_ii(sizeof(fixedbuf), drawstr_left_len)); BLI_strncpy(fixedbuf, drawstr + but->ofs, min_ii(sizeof(fixedbuf), drawlen));
str = strchr(fixedbuf, but->menu_key - 32); /* upper case */ str = strchr(fixedbuf, but->menu_key - 32); /* upper case */
if (str == NULL) if (str == NULL)
@@ -1496,6 +1498,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
} }
} }
} }
}
/* part text right aligned */ /* part text right aligned */
if (drawstr_right) { if (drawstr_right) {