blender
/
blender
136
417
Fork 599
Code Issues 6.3k Pull Requests 777 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 +4 -5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 836f1eeb06 - Show all commits

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

@ -1882,6 +1882,7 @@ static void widget_draw_text(const uiFontStyle *fstyle,
const char *drawstr = but->drawstr;
const char *drawstr_right = nullptr;
bool use_right_only = false;
const char *indeterminate_str = UI_VALUE_INDETERMINATE_CHAR;
#ifdef WITH_INPUT_IME
const wmIMEData *ime_data;
@ -1946,11 +1947,9 @@ static void widget_draw_text(const uiFontStyle *fstyle,
UI_BTYPE_TEXT,
UI_BTYPE_SEARCH_MENU))
{
Harley marked this conversation as resolved
Julian Eisel commented 2023-07-14 15:21:32 +02:00
Review
Copy Link

Do not modify but->drawstr here, the function shouldn't have such side effects. Modify the local drawstr instead.

Do not modify `but->drawstr` here, the function shouldn't have such side effects. Modify the local `drawstr` instead.
STRNCPY(but->drawstr, UI_VALUE_INDETERMINATE_CHAR);
drawstr = indeterminate_str;
drawstr_left_len = strlen(drawstr);
Harley marked this conversation as resolved Outdated
Julian Eisel commented 2023-07-14 15:27:59 +02:00
Outdated
Review
Copy Link

This doesn't have any impact, use_right_only is already false at this point, and may only be set to true later. Same for drawstr_right.

I think a bool drawstr_overridden makes sense. When true we don't draw right aligned text. This could also be set when but->editstr is true.

This doesn't have any impact, `use_right_only` is already false at this point, and may only be set to true later. Same for `drawstr_right`. I think a `bool drawstr_overridden` makes sense. When true we don't draw right aligned text. This could also be set when `but->editstr` is true.
align = UI_STYLE_TEXT_CENTER;
use_right_only = false;
drawstr_right = nullptr;
drawstr_left_len = strlen(but->drawstr);
}
/* text button selection, cursor, composite underline */
@ -5070,7 +5069,7 @@ void ui_draw_but(const bContext *C, ARegion *region, uiStyle *style, uiBut *but,
state.but_flag &= ~UI_BUT_OVERRIDDEN;
}
if ((state.but_drawflag & UI_BUT_INDETERMINATE) && (state.but_flag & UI_SELECT)) {
if (state.but_drawflag & UI_BUT_INDETERMINATE) {
state.but_flag &= ~UI_SELECT;
Harley marked this conversation as resolved
Julian Eisel commented 2023-07-14 14:49:51 +02:00
Review
Copy Link

I'd remove the && (state.but_flag & UI_SELECT) part, just makes the logic look unnecessarily complex.

I'd remove the ` && (state.but_flag & UI_SELECT)` part, just makes the logic look unnecessarily complex.
}