[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31811] trunk/blender/source/blender/ editors/interface/interface_widgets.c: Fix [#23634] Edit Box in World / Ambient Occlusion has wrong background colour

[Matt Ebb]

Revision: 31811
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31811
Author:   broken
Date:     2010-09-07 13:14:20 +0200 (Tue, 07 Sep 2010)

Log Message:
-----------
Fix [#23634] Edit Box in World / Ambient Occlusion has wrong background colour

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	2010-09-07 10:48:25 UTC (rev 31810)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2010-09-07 11:14:20 UTC (rev 31811)
@@ -1419,10 +1419,6 @@
 			widget_state_blend(wt->wcol.inner, wcol_state->inner_driven_sel, wcol_state->blend);
 
 		VECCOPY(wt->wcol.text, wt->wcol.text_sel);
-		
-		if (!(state & UI_TEXTINPUT))
-			/* swap for selection - show depressed */
-			SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
 	}
 	else {
 		if(state & UI_BUT_ANIMATED_KEY)
@@ -1452,6 +1448,7 @@
 	/* now, set the inner-part so that it reflects state settings too */
 	// TODO: maybe we should have separate settings for the blending colors used for this case?
 	if(state & UI_SELECT) {
+		
 		if(state & UI_BUT_ANIMATED_KEY)
 			widget_state_blend(wt->wcol.item, wcol_state->inner_key_sel, blend);
 		else if(state & UI_BUT_ANIMATED)
@@ -2227,7 +2224,9 @@
 	VECCOPY(outline, wcol->outline);
 	VECCOPY(wcol->outline, wcol->item);
 	VECCOPY(wcol->inner, wcol->item);
-	SWAP(short, wcol->shadetop, wcol->shadedown);
+
+	if(!(state & UI_SELECT))
+		SWAP(short, wcol->shadetop, wcol->shadedown);
 	
 	rect1= *rect;