diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-01-11 11:35:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-01-11 11:43:29 +0300 |
| commit | 4d6b8925e621f534eea4ebb440149053f06da496 (patch) | |
| tree | f73e0230854d709ad64a78030598ab4d20c2b01f /source/blender/editors/interface/interface_widgets.c | |
| parent | af85639e0e1dbe38e66ad2717baea331b720aa2d (diff) | |
Fix T47158: Labels w/ icons use button text color
Icon buttons with text labels now use the same color as labels.
This was causing problems with theming since there was no way to set color
for all labels without also changing button text color.
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index e62018c5daf..8198f68adf1 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -3492,6 +3492,8 @@ static uiWidgetType *widget_type(uiWidgetTypeEnum type) /* specials */ case UI_WTYPE_ICON: + /* behave like regular labels (this is simply a label with an icon) */ + wt.state = widget_state_label; wt.custom = widget_icon_has_anim; break; |