Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2021-01-08 01:28:26 +0300
committerHans Goudey <h.goudey@me.com>2021-01-08 01:28:26 +0300
commit61f1faac3f2154de27cedbb100b938e447e5046f (patch)
tree32fd877ee834ea60aa4534e3d9c34c32ddd6fe8f /source/blender/editors/interface
parent5530d6f86fb802c2fa514f7ccc2219af419d2702 (diff)
Fix T83868: Disabled or inactive list items are not grayed out
The cause for this was quite simple-- a misplaced bitwise operation before passing a value to the function that grayed out buttons based on their state, caused by refactoring in rB933bf62a611f before committing. What makes the situation a little more confusing is that the theme colors are overridden for list buttons in UI lists, necessitating a second call to `ui_widget_color_disabled()`. Ideally that wouldn't be necessary.
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r--source/blender/editors/interface/interface_widgets.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 7cd8cc7a13b..a99f05730bb 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2558,7 +2558,7 @@ static void widget_state(uiWidgetType *wt, int state, int drawflag, eUIEmbossTyp
wt->wcol_theme = &btheme->tui.wcol_list_item;
if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE | UI_SEARCH_FILTER_NO_MATCH)) {
- ui_widget_color_disabled(wt, state & UI_SEARCH_FILTER_NO_MATCH);
+ ui_widget_color_disabled(wt, state);
}
}