diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-03-22 19:37:23 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-05 11:36:07 +0300 |
| commit | f601a4b4f7b03db090d4009b0484a6675ac5b81b (patch) | |
| tree | 2cb4124a0c23727623dd17231429a00117558bec /source/blender | |
| parent | 0889f8c127622ecc9383e73e20a274063f0bcc03 (diff) | |
Fix T47830: Multi-edit w/ ui-list wont highlight
Regression from 4d6b892.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface_intern.h | 1 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 66510fb470d..d828c4e0a20 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -92,6 +92,7 @@ typedef enum { /* specials */ UI_WTYPE_ICON, + UI_WTYPE_ICON_LABEL, UI_WTYPE_SWATCH, UI_WTYPE_RGB_PICKER, UI_WTYPE_UNITVEC, diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 5898f3b7e6b..21ff857b830 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); |