[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25944] trunk/blender/source/blender/ editors/interface: Fix [#20655] wrong button shading

[Matt Ebb]

Revision: 25944
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25944
Author:   broken
Date:     2010-01-13 03:01:34 +0100 (Wed, 13 Jan 2010)

Log Message:
-----------
Fix [#20655] wrong button shading

Also restored copy/paste for color swatches

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

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2010-01-13 00:43:59 UTC (rev 25943)
+++ trunk/blender/source/blender/editors/interface/interface.c	2010-01-13 02:01:34 UTC (rev 25944)
@@ -812,7 +812,7 @@
 			if(value == but->hardmax) push= 1;
 			break;
 		case COL:
-			push= 1;
+			push= 2;
 			break;
 		default:
 			push= 2;

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-01-13 00:43:59 UTC (rev 25943)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-01-13 02:01:34 UTC (rev 25944)
@@ -948,7 +948,7 @@
 		else {
 			if (sscanf(buf, "[%f, %f, %f]", &rgb[0], &rgb[1], &rgb[2]) == 3) {
 				button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
-				VECCOPY(data->vec, rgb);
+				ui_set_but_vectorf(but, rgb);
 				button_activate_state(C, but, BUTTON_STATE_EXIT);
 			}
 		}

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2010-01-13 00:43:59 UTC (rev 25943)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2010-01-13 02:01:34 UTC (rev 25944)
@@ -1330,10 +1330,8 @@
 
 		VECCOPY(wt->wcol.text, wt->wcol.text_sel);
 		
-		/* only flip shade if it's not "pushed in" already */
-		if(wt->wcol.shaded && wt->wcol.shadetop>wt->wcol.shadedown) {
-			SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
-		}
+		/* swap for selection - show depressed */
+		SWAP(short, wt->wcol.shadetop, wt->wcol.shadedown);
 	}
 	else {
 		if(state & UI_BUT_ANIMATED_KEY)