[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59511] trunk/blender/source/blender/ editors/interface/interface_widgets.c: Bugfix #36324

[Ton Roosendaal]

Revision: 59511
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59511
Author:   ton
Date:     2013-08-26 09:59:51 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Bugfix #36324

Commit 57760, June this year, broke Theme colors for Label Buttons.
All labels, in every editor or region, now were using same color.

These colors have to be derived from the Editor settings. Code for
this was mistakingly removed.

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-08-26 09:37:15 UTC (rev 59510)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2013-08-26 09:59:51 UTC (rev 59511)
@@ -2850,6 +2850,16 @@
 	rect->xmin += BLI_rcti_size_y(rect) * 0.7 + delta;
 }
 
+/* labels use Editor theme colors for text */
+static void widget_state_label(uiWidgetType *wt, int state)
+{
+	/* call this for option button */
+	widget_state(wt, state);
+	if (state & UI_SELECT)
+		UI_GetThemeColor3ubv(TH_TEXT_HI, (unsigned char *)wt->wcol.text);
+	else
+		UI_GetThemeColor3ubv(TH_TEXT, (unsigned char *)wt->wcol.text);
+}
 
 static void widget_radiobut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign)
 {
@@ -2973,6 +2983,7 @@
 			/* fall-through */  /* we use usual label code too. */
 		case UI_WTYPE_LABEL:
 			wt.draw = NULL;
+			wt.state = widget_state_label;
 			break;
 			
 		case UI_WTYPE_TOGGLE: