From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- source/blender/editors/space_node/node_buttons.c | 290 ++++++++++++----------- 1 file changed, 158 insertions(+), 132 deletions(-) (limited to 'source/blender/editors/space_node/node_buttons.c') diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c index 13f8eb0729e..63e97ecd955 100644 --- a/source/blender/editors/space_node/node_buttons.c +++ b/source/blender/editors/space_node/node_buttons.c @@ -45,8 +45,7 @@ #include "UI_resources.h" -#include "node_intern.h" /* own include */ - +#include "node_intern.h" /* own include */ /* ******************* node space & buttons ************** */ @@ -54,181 +53,208 @@ /* poll for active nodetree */ static bool active_nodetree_poll(const bContext *C, PanelType *UNUSED(pt)) { - SpaceNode *snode = CTX_wm_space_node(C); + SpaceNode *snode = CTX_wm_space_node(C); - return (snode && snode->nodetree); + return (snode && snode->nodetree); } #endif static bool node_sockets_poll(const bContext *C, PanelType *UNUSED(pt)) { - SpaceNode *snode = CTX_wm_space_node(C); + SpaceNode *snode = CTX_wm_space_node(C); - return (snode && snode->nodetree && G.debug_value == 777); + return (snode && snode->nodetree && G.debug_value == 777); } static void node_sockets_panel(const bContext *C, Panel *pa) { - SpaceNode *snode = CTX_wm_space_node(C); - bNodeTree *ntree = (snode) ? snode->edittree : NULL; - bNode *node = (ntree) ? nodeGetActive(ntree) : NULL; - bNodeSocket *sock; - uiLayout *layout = pa->layout, *split; - char name[UI_MAX_NAME_STR]; - - if (ELEM(NULL, ntree, node)) { - return; - } - - for (sock = node->inputs.first; sock; sock = sock->next) { - BLI_snprintf(name, sizeof(name), "%s:", sock->name); - - split = uiLayoutSplit(layout, 0.35f, false); - uiItemL(split, name, ICON_NONE); - uiTemplateNodeLink(split, ntree, node, sock); - } + SpaceNode *snode = CTX_wm_space_node(C); + bNodeTree *ntree = (snode) ? snode->edittree : NULL; + bNode *node = (ntree) ? nodeGetActive(ntree) : NULL; + bNodeSocket *sock; + uiLayout *layout = pa->layout, *split; + char name[UI_MAX_NAME_STR]; + + if (ELEM(NULL, ntree, node)) { + return; + } + + for (sock = node->inputs.first; sock; sock = sock->next) { + BLI_snprintf(name, sizeof(name), "%s:", sock->name); + + split = uiLayoutSplit(layout, 0.35f, false); + uiItemL(split, name, ICON_NONE); + uiTemplateNodeLink(split, ntree, node, sock); + } } static bool node_tree_interface_poll(const bContext *C, PanelType *UNUSED(pt)) { - SpaceNode *snode = CTX_wm_space_node(C); + SpaceNode *snode = CTX_wm_space_node(C); - return (snode && snode->edittree && (snode->edittree->inputs.first || snode->edittree->outputs.first)); + return (snode && snode->edittree && + (snode->edittree->inputs.first || snode->edittree->outputs.first)); } static bool node_tree_find_active_socket(bNodeTree *ntree, bNodeSocket **r_sock, int *r_in_out) { - bNodeSocket *sock; - for (sock = ntree->inputs.first; sock; sock = sock->next) { - if (sock->flag & SELECT) { - *r_sock = sock; - *r_in_out = SOCK_IN; - return true; - } - } - for (sock = ntree->outputs.first; sock; sock = sock->next) { - if (sock->flag & SELECT) { - *r_sock = sock; - *r_in_out = SOCK_OUT; - return true; - } - } - - *r_sock = NULL; - *r_in_out = 0; - return false; + bNodeSocket *sock; + for (sock = ntree->inputs.first; sock; sock = sock->next) { + if (sock->flag & SELECT) { + *r_sock = sock; + *r_in_out = SOCK_IN; + return true; + } + } + for (sock = ntree->outputs.first; sock; sock = sock->next) { + if (sock->flag & SELECT) { + *r_sock = sock; + *r_in_out = SOCK_OUT; + return true; + } + } + + *r_sock = NULL; + *r_in_out = 0; + return false; } static void node_tree_interface_panel(const bContext *C, Panel *pa) { - SpaceNode *snode = CTX_wm_space_node(C); - bNodeTree *ntree = (snode) ? snode->edittree : NULL; - bNodeSocket *sock; - int in_out; - uiLayout *layout = pa->layout, *row, *split, *col; - PointerRNA ptr, sockptr, opptr; - wmOperatorType *ot; - - if (!ntree) { - return; - } - - RNA_id_pointer_create((ID *)ntree, &ptr); - - node_tree_find_active_socket(ntree, &sock, &in_out); - RNA_pointer_create((ID *)ntree, &RNA_NodeSocketInterface, sock, &sockptr); - - row = uiLayoutRow(layout, false); - - split = uiLayoutRow(row, true); - col = uiLayoutColumn(split, true); - ot = WM_operatortype_find("NODE_OT_tree_socket_add", false); - uiItemL(col, IFACE_("Inputs:"), ICON_NONE); - uiTemplateList(col, (bContext *)C, "NODE_UL_interface_sockets", "inputs", &ptr, "inputs", &ptr, "active_input", - NULL, 0, 0, 0, 0, false, false); - uiItemFullO_ptr(col, ot, "", ICON_PLUS, NULL, WM_OP_EXEC_DEFAULT, 0, &opptr); - RNA_enum_set(&opptr, "in_out", SOCK_IN); - - col = uiLayoutColumn(split, true); - uiItemL(col, IFACE_("Outputs:"), ICON_NONE); - uiTemplateList(col, (bContext *)C, "NODE_UL_interface_sockets", "outputs", &ptr, "outputs", &ptr, "active_output", - NULL, 0, 0, 0, 0, false, false); - uiItemFullO_ptr(col, ot, "", ICON_PLUS, NULL, WM_OP_EXEC_DEFAULT, 0, &opptr); - RNA_enum_set(&opptr, "in_out", SOCK_OUT); - - ot = WM_operatortype_find("NODE_OT_tree_socket_move", false); - col = uiLayoutColumn(row, true); - uiItemFullO_ptr(col, ot, "", ICON_TRIA_UP, NULL, WM_OP_EXEC_DEFAULT, 0, &opptr); - RNA_enum_set(&opptr, "direction", 1); - uiItemFullO_ptr(col, ot, "", ICON_TRIA_DOWN, NULL, WM_OP_EXEC_DEFAULT, 0, &opptr); - RNA_enum_set(&opptr, "direction", 2); - - if (sock) { - row = uiLayoutRow(layout, true); - uiItemR(row, &sockptr, "name", 0, NULL, ICON_NONE); - uiItemO(row, "", ICON_X, "NODE_OT_tree_socket_remove"); - - if (sock->typeinfo->interface_draw) { - uiItemS(layout); - sock->typeinfo->interface_draw((bContext *)C, layout, &sockptr); - } - } + SpaceNode *snode = CTX_wm_space_node(C); + bNodeTree *ntree = (snode) ? snode->edittree : NULL; + bNodeSocket *sock; + int in_out; + uiLayout *layout = pa->layout, *row, *split, *col; + PointerRNA ptr, sockptr, opptr; + wmOperatorType *ot; + + if (!ntree) { + return; + } + + RNA_id_pointer_create((ID *)ntree, &ptr); + + node_tree_find_active_socket(ntree, &sock, &in_out); + RNA_pointer_create((ID *)ntree, &RNA_NodeSocketInterface, sock, &sockptr); + + row = uiLayoutRow(layout, false); + + split = uiLayoutRow(row, true); + col = uiLayoutColumn(split, true); + ot = WM_operatortype_find("NODE_OT_tree_socket_add", false); + uiItemL(col, IFACE_("Inputs:"), ICON_NONE); + uiTemplateList(col, + (bContext *)C, + "NODE_UL_interface_sockets", + "inputs", + &ptr, + "inputs", + &ptr, + "active_input", + NULL, + 0, + 0, + 0, + 0, + false, + false); + uiItemFullO_ptr(col, ot, "", ICON_PLUS, NULL, WM_OP_EXEC_DEFAULT, 0, &opptr); + RNA_enum_set(&opptr, "in_out", SOCK_IN); + + col = uiLayoutColumn(split, true); + uiItemL(col, IFACE_("Outputs:"), ICON_NONE); + uiTemplateList(col, + (bContext *)C, + "NODE_UL_interface_sockets", + "outputs", + &ptr, + "outputs", + &ptr, + "active_output", + NULL, + 0, + 0, + 0, + 0, + false, + false); + uiItemFullO_ptr(col, ot, "", ICON_PLUS, NULL, WM_OP_EXEC_DEFAULT, 0, &opptr); + RNA_enum_set(&opptr, "in_out", SOCK_OUT); + + ot = WM_operatortype_find("NODE_OT_tree_socket_move", false); + col = uiLayoutColumn(row, true); + uiItemFullO_ptr(col, ot, "", ICON_TRIA_UP, NULL, WM_OP_EXEC_DEFAULT, 0, &opptr); + RNA_enum_set(&opptr, "direction", 1); + uiItemFullO_ptr(col, ot, "", ICON_TRIA_DOWN, NULL, WM_OP_EXEC_DEFAULT, 0, &opptr); + RNA_enum_set(&opptr, "direction", 2); + + if (sock) { + row = uiLayoutRow(layout, true); + uiItemR(row, &sockptr, "name", 0, NULL, ICON_NONE); + uiItemO(row, "", ICON_X, "NODE_OT_tree_socket_remove"); + + if (sock->typeinfo->interface_draw) { + uiItemS(layout); + sock->typeinfo->interface_draw((bContext *)C, layout, &sockptr); + } + } } /* ******************* node buttons registration ************** */ void node_buttons_register(ARegionType *art) { - PanelType *pt; - - pt = MEM_callocN(sizeof(PanelType), "spacetype node panel node sockets"); - strcpy(pt->idname, "NODE_PT_sockets"); - strcpy(pt->category, N_("Node")); - strcpy(pt->label, N_("Sockets")); - strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA); - pt->draw = node_sockets_panel; - pt->poll = node_sockets_poll; - pt->flag |= PNL_DEFAULT_CLOSED; - BLI_addtail(&art->paneltypes, pt); - - pt = MEM_callocN(sizeof(PanelType), "spacetype node panel tree interface"); - strcpy(pt->idname, "NODE_PT_node_tree_interface"); - strcpy(pt->category, N_("Node")); - strcpy(pt->label, N_("Interface")); - strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA); - pt->draw = node_tree_interface_panel; - pt->poll = node_tree_interface_poll; - BLI_addtail(&art->paneltypes, pt); + PanelType *pt; + + pt = MEM_callocN(sizeof(PanelType), "spacetype node panel node sockets"); + strcpy(pt->idname, "NODE_PT_sockets"); + strcpy(pt->category, N_("Node")); + strcpy(pt->label, N_("Sockets")); + strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA); + pt->draw = node_sockets_panel; + pt->poll = node_sockets_poll; + pt->flag |= PNL_DEFAULT_CLOSED; + BLI_addtail(&art->paneltypes, pt); + + pt = MEM_callocN(sizeof(PanelType), "spacetype node panel tree interface"); + strcpy(pt->idname, "NODE_PT_node_tree_interface"); + strcpy(pt->category, N_("Node")); + strcpy(pt->label, N_("Interface")); + strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA); + pt->draw = node_tree_interface_panel; + pt->poll = node_tree_interface_poll; + BLI_addtail(&art->paneltypes, pt); } static int node_properties_toggle_exec(bContext *C, wmOperator *UNUSED(op)) { - ScrArea *sa = CTX_wm_area(C); - ARegion *ar = node_has_buttons_region(sa); + ScrArea *sa = CTX_wm_area(C); + ARegion *ar = node_has_buttons_region(sa); - if (ar) { - ED_region_toggle_hidden(C, ar); - } + if (ar) { + ED_region_toggle_hidden(C, ar); + } - return OPERATOR_FINISHED; + return OPERATOR_FINISHED; } /* non-standard poll operator which doesn't care if there are any nodes */ static bool node_properties_poll(bContext *C) { - ScrArea *sa = CTX_wm_area(C); - return (sa && (sa->spacetype == SPACE_NODE)); + ScrArea *sa = CTX_wm_area(C); + return (sa && (sa->spacetype == SPACE_NODE)); } void NODE_OT_properties(wmOperatorType *ot) { - ot->name = "Toggle Sidebar"; - ot->description = "Toggle the properties region visibility"; - ot->idname = "NODE_OT_properties"; + ot->name = "Toggle Sidebar"; + ot->description = "Toggle the properties region visibility"; + ot->idname = "NODE_OT_properties"; - ot->exec = node_properties_toggle_exec; - ot->poll = node_properties_poll; + ot->exec = node_properties_toggle_exec; + ot->poll = node_properties_poll; - /* flags */ - ot->flag = 0; + /* flags */ + ot->flag = 0; } -- cgit v1.2.3