blender
/
blender
136
417
Fork 600
Code Issues 6.3k Pull Requests 780 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 +8 -3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f8b05e5620 - Show all commits

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

@ -3788,6 +3788,9 @@ static void ui_but_update_ex(uiBut *but, const bool validate)
/* if something changed in the button */
double value = UI_BUT_VALUE_UNSET;
/* Use emdash in place of text when in indeterminate state. */
const char *emdash = "\u2014";
Harley marked this conversation as resolved Outdated
Julian Eisel commented 2023-06-09 16:52:36 +02:00
Outdated
Review
Copy Link

emdash isn't really useful either, this should be more descriptive. Would suggest something like UI_VALUE_INDETERMINATE_CHAR.

`emdash` isn't really useful either, this should be more descriptive. Would suggest something like `UI_VALUE_INDETERMINATE_CHAR`.
Harley marked this conversation as resolved Outdated
Julian Eisel commented 2023-07-04 15:21:21 +02:00
Outdated
Review
Copy Link

Would put this in UI_interface.h, together with other defines like UI_SEP_CHAR_S.

Would put this in `UI_interface.h`, together with other defines like `UI_SEP_CHAR_S`.
ui_but_update_select_flag(but, &value);
/* only update soft range while not editing */
@ -3798,7 +3801,9 @@ static void ui_but_update_ex(uiBut *but, const bool validate)
}
if (but->drawflag & UI_BUT_INDETERMINATE) {
/* Center text. */
Harley marked this conversation as resolved Outdated
Julian Eisel commented 2023-06-09 16:55:51 +02:00
Outdated
Review
Copy Link

These comments only explain what it does which is obvious from the code. But why does it do this? And for which button types?

These comments only explain what it does which is obvious from the code. But why does it do this? And for which button types?
but->drawflag &= ~(UI_BUT_TEXT_LEFT | UI_BUT_TEXT_RIGHT);
/* Do not show toggles as selected. */
but->flag &= ~(UI_SELECT);
}
@ -3867,7 +3872,7 @@ static void ui_but_update_ex(uiBut *but, const bool validate)
}
}
if (but->drawflag & UI_BUT_INDETERMINATE) {
Harley marked this conversation as resolved Outdated
Julian Eisel commented 2023-07-04 17:28:11 +02:00
Outdated
Review
Copy Link

Same here, not sure if we should permanently modify the drawing flags here. Can be done just before drawing.

Actually, let's not even override the draw-string here, and just do that in widget_draw_text() by setting drawstr to UI_VALUE_INDETERMINATE_CHAR for specific button types.

Same here, not sure if we should permanently modify the drawing flags here. Can be done just before drawing. Actually, let's not even override the draw-string here, and just do that in `widget_draw_text()` by setting `drawstr` to `UI_VALUE_INDETERMINATE_CHAR` for specific button types.
STRNCPY(but->drawstr, "\u2014");
STRNCPY(but->drawstr, emdash);
}
else {
STRNCPY(but->drawstr, but->str);
@ -3882,7 +3887,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) {
STRNCPY(but->drawstr, "\u2014");
STRNCPY(but->drawstr, emdash);
}
else if (ui_but_is_float(but)) {
ui_but_build_drawstr_float(but, value);
@ -3908,7 +3913,7 @@ static void ui_but_update_ex(uiBut *but, const bool validate)
case UI_BTYPE_SEARCH_MENU:
if (!but->editstr) {
if (but->drawflag & UI_BUT_INDETERMINATE) {
STRNCPY(but->drawstr, "\u2014");
STRNCPY(but->drawstr, emdash);
}
else {
char str[UI_MAX_DRAW_STR];