[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34976] trunk/blender/source/blender/ editors/space_node: Bugfix #26101

[Ton Roosendaal]

Revision: 34976
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34976
Author:   ton
Date:     2011-02-18 17:53:11 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
Bugfix #26101

Node editor: icons in header sometimes were on wrong locations.
The click hotspots were also off...

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_draw.c
    trunk/blender/source/blender/editors/space_node/node_state.c

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c	2011-02-18 16:47:10 UTC (rev 34975)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2011-02-18 17:53:11 UTC (rev 34976)
@@ -665,8 +665,8 @@
 	uiSetRoundBox(3);
 	uiRoundBox(rct->xmin, rct->ymax-NODE_DY, rct->xmax, rct->ymax, BASIS_RAD);
 	
-	/* show/hide icons, note this sequence is copied in editnode.c */
-	iconofs= rct->xmax;
+	/* show/hide icons, note this sequence is copied in do_header_node() node_state.c */
+	iconofs= rct->xmax - 7.0f;
 	
 	if(node->typeinfo->flag & NODE_PREVIEW) {
 		int icon_id;
@@ -675,7 +675,7 @@
 			icon_id= ICON_MATERIAL;
 		else
 			icon_id= ICON_MATERIAL_DATA;
-		iconofs-=22.0f;
+		iconofs-=15.0f;
 		uiDefIconBut(node->block, LABEL, B_REDR, icon_id, iconofs, rct->ymax-NODE_DY,
 					 UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 1.0, 0.5, "");
 	}

Modified: trunk/blender/source/blender/editors/space_node/node_state.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_state.c	2011-02-18 16:47:10 UTC (rev 34975)
+++ trunk/blender/source/blender/editors/space_node/node_state.c	2011-02-18 17:53:11 UTC (rev 34976)
@@ -117,21 +117,21 @@
 			node->flag ^= NODE_PREVIEW;
 			return 1;
 		}
-		totr.xmin-=18.0f;
+		totr.xmin-=15.0f;
 	}
 	if(node->type == NODE_GROUP) {
 		if(BLI_in_rctf(&totr, mx, my)) {
 			snode_make_group_editable(snode, node);
 			return 1;
 		}
-		totr.xmin-=18.0f;
+		totr.xmin-=15.0f;
 	}
 	if(node->typeinfo->flag & NODE_OPTIONS) {
 		if(BLI_in_rctf(&totr, mx, my)) {
 			node->flag ^= NODE_OPTIONS;
 			return 1;
 		}
-		totr.xmin-=18.0f;
+		totr.xmin-=15.0f;
 	}
 	/* hide unused sockets */
 	if(BLI_in_rctf(&totr, mx, my)) {