[Bf-blender-cvs] [4412144] master: Palette active color:

[Antony Riakiotakis]

Commit: 44121442e97496963a13a80a3d96c24d8b38392f
Author: Antony Riakiotakis
Date:   Thu Sep 18 12:20:34 2014 +0200
Branches: master
https://developer.blender.org/rB44121442e97496963a13a80a3d96c24d8b38392f

Palette active color:

Use indicator color derived from color luminance for better contrast.

===================================================================

M	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 ff46925..0ffd45e 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2901,8 +2901,15 @@ static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int stat
 	if (but->a1 == UI_PALETTE_COLOR && but->a2 == UI_PALETTE_COLOR_ACTIVE) {
 		float width = rect->xmax - rect->xmin;
 		float height = rect->ymax - rect->ymin;
-
-		glColor4ubv((unsigned char *)wcol->outline);
+		/* find color luminance and change it slightly */
+		float bw = rgb_to_bw(col);
+		
+		if (bw > 0.5)
+			bw -= 0.5;
+		else
+			bw += 0.5;
+		
+		glColor4f(bw, bw, bw, 1.0);
 		glBegin(GL_TRIANGLES);
 		glVertex2f(rect->xmin + 0.1f * width, rect->ymin + 0.9f * height);
 		glVertex2f(rect->xmin + 0.1f * width, rect->ymin + 0.5f * height);