diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-27 00:28:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-27 00:28:12 +0400 |
| commit | af36eb86e23e2337411c4085f530844aa173d72d (patch) | |
| tree | 4c1712f2531b9ad8425151a3d9730837a9c1f3c9 /source/blender/editors/interface/interface_widgets.c | |
| parent | 5fac3d9db5c10499e8c2142a51d4feeb74b23df3 (diff) | |
Further fix for #35880: theme color of enabled option buttons in popups was still
controlled by the wrong color, now it's controlled by "Menu Back" text color. This
is somewhat confusing but we like some other widgets the standard colors do not
work well on the dark background of popups.
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 6ac681104d0..9b736eb1bf4 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1735,18 +1735,16 @@ static void widget_state_numslider(uiWidgetType *wt, int state) /* labels use theme colors for text */ static void widget_state_option_menu(uiWidgetType *wt, int state) { + bTheme *btheme = UI_GetTheme(); /* XXX */ /* call this for option button */ widget_state(wt, state); /* if not selected we get theme from menu back */ if (state & UI_SELECT) - UI_GetThemeColor4ubv(TH_TEXT_HI, (unsigned char *)wt->wcol.text); - else { - bTheme *btheme = UI_GetTheme(); /* XXX */ - + copy_v3_v3_char(wt->wcol.text, btheme->tui.wcol_menu_back.text_sel); + else copy_v3_v3_char(wt->wcol.text, btheme->tui.wcol_menu_back.text); - } } |