[Bf-blender-cvs] [56428a46b9a] master: Fix T60719: muted nodes are not clearly visible.

[Robert Guetzkow]

Commit: 56428a46b9ae0f82b37ee041849bb7847b9afabb
Author: Robert Guetzkow
Date:   Thu Mar 28 17:39:54 2019 +0100
Branches: master
https://developer.blender.org/rB56428a46b9ae0f82b37ee041849bb7847b9afabb

Fix T60719: muted nodes are not clearly visible.

Now the entire node gets greyed out, instead of using a red header that is
hard to distinguish from other nodes with similar header colors.

Differential Revision: https://developer.blender.org/D4597

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

M	source/blender/editors/space_node/node_draw.c

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

diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 2d25c067d69..06431d3def8 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -388,6 +388,11 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 		layout = UI_block_layout(
 		        node->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL,
 		        locx + NODE_DYS, dy, NODE_WIDTH(node) - NODE_DY, NODE_DY, 0, UI_style_get());
+
+		if (node->flag & NODE_MUTED) {
+			uiLayoutSetActive(layout, false);
+		}
+
 		/* context pointers for current node and socket */
 		uiLayoutSetContextPointer(layout, "node", &nodeptr);
 		uiLayoutSetContextPointer(layout, "socket", &sockptr);
@@ -473,6 +478,11 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 		layout = UI_block_layout(
 		        node->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL,
 		        locx + NODE_DYS, dy, node->butr.xmax, 0, 0, UI_style_get());
+
+		if (node->flag & NODE_MUTED) {
+			uiLayoutSetActive(layout, false);
+		}
+
 		uiLayoutSetContextPointer(layout, "node", &nodeptr);
 
 		node->typeinfo->draw_buttons(layout, (bContext *)C, &nodeptr);
@@ -494,6 +504,11 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 		layout = UI_block_layout(
 		        node->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL,
 		        locx + NODE_DYS, dy, NODE_WIDTH(node) - NODE_DY, NODE_DY, 0, UI_style_get());
+
+		if (node->flag & NODE_MUTED) {
+			uiLayoutSetActive(layout, false);
+		}
+
 		/* context pointers for current node and socket */
 		uiLayoutSetContextPointer(layout, "node", &nodeptr);
 		uiLayoutSetContextPointer(layout, "socket", &sockptr);
@@ -671,6 +686,11 @@ static void node_socket_circle_draw(const bContext *C, bNodeTree *ntree, Pointer
 	RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &ptr);
 	sock->typeinfo->draw_color((bContext *)C, &ptr, &node_ptr, color);
 
+	bNode *node = node_ptr.data;
+	if (node->flag & NODE_MUTED) {
+		color[3] *= 0.25f;
+	}
+
 	immAttr4fv(col, color);
 	immVertex2f(pos, sock->locx, sock->locy);
 }
@@ -937,16 +957,13 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 	node_draw_shadow(snode, node, BASIS_RAD, 1.0f);
 
 	if (node->flag & NODE_MUTED) {
-		UI_GetThemeColorBlendShade4fv(color_id, TH_REDALERT, 0.5f, 0, color);
+		/* Muted nodes are semi-transparent and colorless. */
+		UI_GetThemeColor3fv(TH_NODE, color);
+		color[3] = 0.25f;
 	}
 	else {
-		/* header uses color from backdrop, but we make it opaque */
-		if (color_id == TH_NODE) {
-			UI_GetThemeColorShade3fv(color_id, -20, color);
-		}
-		else {
-			UI_GetThemeColor3fv(color_id, color);
-		}
+		/* Opaque headers for regular nodes. */
+		UI_GetThemeColor3fv(color_id, color);
 		color[3] = 1.0f;
 	}
 
@@ -1012,19 +1029,23 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 
 	nodeLabel(ntree, node, showname, sizeof(showname));
 
-	/* XXX - don't print into self! */
-	//if (node->flag & NODE_MUTED)
-	//	BLI_snprintf(showname, sizeof(showname), "[%s]", showname);
-
-	uiDefBut(node->block, UI_BTYPE_LABEL, 0, showname,
-	         (int)(rct->xmin + (NODE_MARGIN_X)), (int)(rct->ymax - NODE_DY),
-	         (short)(iconofs - rct->xmin - 18.0f), (short)NODE_DY,
-	         NULL, 0, 0, 0, 0, "");
+	uiBut *but = uiDefBut(node->block, UI_BTYPE_LABEL, 0, showname,
+	                      (int)(rct->xmin + (NODE_MARGIN_X)), (int)(rct->ymax - NODE_DY),
+	                      (short)(iconofs - rct->xmin - 18.0f), (short)NODE_DY,
+	                      NULL, 0, 0, 0, 0, "");
+	if (node->flag & NODE_MUTED) {
+		UI_but_flag_enable(but, UI_BUT_INACTIVE);
+	}
 
 	/* body */
 	if (!nodeIsRegistered(node)) {
 		/* use warning color to indicate undefined types */
 		UI_GetThemeColor4fv(TH_REDALERT, color);
+
+	}
+	else if (node->flag & NODE_MUTED) {
+		/* Muted nodes are semi-transparent and colorless. */
+		UI_GetThemeColor4fv(TH_NODE, color);
 	}
 	else if (node->flag & NODE_CUSTOM_COLOR) {
 		rgba_float_args_set(color, node->color[0], node->color[1], node->color[2], 1.0f);
@@ -1033,6 +1054,10 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		UI_GetThemeColor4fv(TH_NODE, color);
 	}
 
+	if (node->flag & NODE_MUTED) {
+		color[3] = 0.5f;
+	}
+
 	UI_draw_roundbox_corner_set(UI_CNR_BOTTOM_LEFT | UI_CNR_BOTTOM_RIGHT);
 	UI_draw_roundbox_aa(true, rct->xmin, rct->ymin, rct->xmax, rct->ymax - NODE_DY, BASIS_RAD, color);
 
@@ -1086,7 +1111,9 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
 
 	/* body */
 	if (node->flag & NODE_MUTED) {
-		UI_GetThemeColorBlendShade4fv(color_id, TH_REDALERT, 0.5f, 0, color);
+		/* Muted nodes are semi-transparent and colorless. */
+		UI_GetThemeColor4fv(TH_NODE, color);
+		color[3] = 0.25f;
 	}
 	else {
 		UI_GetThemeColor4fv(color_id, color);