From af36eb86e23e2337411c4085f530844aa173d72d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 26 Jun 2013 20:28:12 +0000 Subject: 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. --- source/blender/editors/interface/interface_widgets.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/interface/interface_widgets.c') 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); - } } -- cgit v1.2.3