blender
/
blender
137
417
Fork 599
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

UI: uiBut Indeterminate State #108210

Merged
Julian Eisel merged 15 commits from Harley/blender:Indeterminate into main 2023-07-17 19:37:24 +02:00
Conversation 5 Commits 15 Files Changed 4 +14 -7
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f88c5075a6 - Show all commits

21
source/blender/editors/interface/interface.cc
View File

@ -3861,7 +3861,10 @@ static void ui_but_update_ex(uiBut *but, const bool validate)
}
}
}
if (!(but->drawflag & UI_BUT_INDETERMINATE)) {
if (but->drawflag & UI_BUT_INDETERMINATE) {
STRNCPY(but->drawstr, "\u2014");
}
else {
STRNCPY(but->drawstr, but->str);
}
}
Harley marked this conversation as resolved Outdated
Julian Eisel commented 2023-06-05 12:23:24 +02:00
Outdated
Review
Copy Link

It's not clear what \u2014 is, better make this a named constant.

It's not clear what `\u2014` is, better make this a named constant.
@ -3874,7 +3877,7 @@ static void ui_but_update_ex(uiBut *but, const bool validate)
}
UI_GET_BUT_VALUE_INIT(but, value);
if (but->drawflag & UI_BUT_INDETERMINATE) {
/* Pass. */
STRNCPY(but->drawstr, "\u2014");
}
else if (ui_but_is_float(but)) {
ui_but_build_drawstr_float(but, value);
@ -3898,11 +3901,15 @@ static void ui_but_update_ex(uiBut *but, const bool validate)
case UI_BTYPE_TEXT:
case UI_BTYPE_SEARCH_MENU:
if (!but->editstr && !(but->drawflag & UI_BUT_INDETERMINATE)) {
char str[UI_MAX_DRAW_STR];
ui_but_string_get(but, str, UI_MAX_DRAW_STR);
SNPRINTF(but->drawstr, "%s%s", but->str, str);
if (!but->editstr) {
if (but->drawflag & UI_BUT_INDETERMINATE) {
STRNCPY(but->drawstr, "\u2014");
}
else {
char str[UI_MAX_DRAW_STR];
ui_but_string_get(but, str, UI_MAX_DRAW_STR);
SNPRINTF(but->drawstr, "%s%s", but->str, str);
}
}
break;