[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57785] trunk/blender/source/blender/ editors/interface/interface_widgets.c: Further fix for #35880: theme color of enabled option buttons in popups was still

[Brecht Van Lommel]

Revision: 57785
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57785
Author:   blendix
Date:     2013-06-26 20:28:12 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_widgets.c

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2013-06-26 20:15:02 UTC (rev 57784)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2013-06-26 20:28:12 UTC (rev 57785)
@@ -1735,18 +1735,16 @@
 /* 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);
-	}
 }