diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-03-22 19:37:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-22 19:37:23 +0300 |
| commit | 0f1d711681dca29cf03fa3198aaa3cdceac0795f (patch) | |
| tree | 3b578b3b56c948ba350e7ff9ae8420aef066c78d /source/blender/editors/interface/interface_widgets.c | |
| parent | 84d8b35d6c060e413ce9f161699848910c7679ca (diff) | |
Fix T47830: Multi-edit w/ ui-list wont highlight
Regression from 4d6b892.
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index f03e21ab70d..841b76c676b 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -3499,6 +3499,10 @@ static uiWidgetType *widget_type(uiWidgetTypeEnum type) /* specials */ case UI_WTYPE_ICON: + wt.custom = widget_icon_has_anim; + break; + + case UI_WTYPE_ICON_LABEL: /* behave like regular labels (this is simply a label with an icon) */ wt.state = widget_state_label; wt.custom = widget_icon_has_anim; @@ -3628,7 +3632,14 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct } else if (but->dt == UI_EMBOSS_NONE) { /* "nothing" */ - wt = widget_type(UI_WTYPE_ICON); + switch (but->type) { + case UI_BTYPE_LABEL: + wt = widget_type(UI_WTYPE_ICON_LABEL); + break; + default: + wt = widget_type(UI_WTYPE_ICON); + break; + } } else if (but->dt == UI_EMBOSS_RADIAL) { wt = widget_type(UI_WTYPE_MENU_ITEM_RADIAL); |