[Bf-blender-cvs] [5b367c9] master: Fix T40534: Multi-button editing, hard to distinguish sliders

Campbell Barton noreply at git.blender.org
Mon Jun 9 13:06:56 CEST 2014


Commit: 5b367c9aaf4fe61f3d1849ec2f74b5b01f770fc9
Author: Campbell Barton
Date:   Mon Jun 9 18:47:56 2014 +1000
https://developer.blender.org/rB5b367c9aaf4fe61f3d1849ec2f74b5b01f770fc9

Fix T40534: Multi-button editing, hard to distinguish sliders

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

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 aed4921..2bd4738 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1828,7 +1828,9 @@ static void widget_state(uiWidgetType *wt, int state)
 
 	if (state & UI_BUT_DRAG_MULTI) {
 		/* the button isn't SELECT but we're editing this so draw with sel color */
-		widget_state_blend(wt->wcol.inner, wt->wcol.inner_sel, 1.0f);
+		copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
+		SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
+		widget_state_blend(wt->wcol.text, wt->wcol.text_sel, 0.85f);
 	}
 
 	if (state & UI_BUT_NODE_ACTIVE) {




More information about the Bf-blender-cvs mailing list