From 2f3b9a55b53f0ee594171fc0dd397409f5b91794 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Wed, 18 Oct 2023 18:23:52 +0200 Subject: [PATCH 1/2] UI: Use single column layout on Tangent node The layout inside nodes is usually a column, not split rows, since nodes are usually narrow and read top-down. --- .../nodes/shader/nodes/node_shader_tangent.cc | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/source/blender/nodes/shader/nodes/node_shader_tangent.cc b/source/blender/nodes/shader/nodes/node_shader_tangent.cc index 59b5cfc16c2..49b767a9c18 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tangent.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tangent.cc @@ -23,13 +23,7 @@ static void node_declare(NodeDeclarationBuilder &b) static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA *ptr) { - uiLayout *split, *row; - - split = uiLayoutSplit(layout, 0.0f, false); - - uiItemR(split, ptr, "direction_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); - - row = uiLayoutRow(split, false); + uiItemR(layout, ptr, "direction_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); if (RNA_enum_get(ptr, "direction_type") == SHD_TANGENT_UVMAP) { PointerRNA obptr = CTX_data_pointer_get(C, "active_object"); @@ -40,15 +34,18 @@ static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA * Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); DEG_get_evaluated_rna_pointer(depsgraph, &obptr, &eval_obptr); PointerRNA dataptr = RNA_pointer_get(&eval_obptr, "data"); - uiItemPointerR(row, ptr, "uv_map", &dataptr, "uv_layers", "", ICON_GROUP_UVS); + uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_layers", "", ICON_GROUP_UVS); } else { - uiItemR(row, ptr, "uv_map", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); + uiItemR(layout, ptr, "uv_map", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_GROUP_UVS); } } else { - uiItemR(row, ptr, "axis", UI_ITEM_R_SPLIT_EMPTY_NAME | UI_ITEM_R_EXPAND, nullptr, ICON_NONE); + uiItemR( + layout, ptr, "axis", UI_ITEM_R_SPLIT_EMPTY_NAME | UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } + + uiItemS(layout); } static void node_shader_init_tangent(bNodeTree * /*ntree*/, bNode *node) -- 2.30.2 From 36054e0c778ca55838b90694cdf5a96e87ed1738 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Wed, 18 Oct 2023 18:36:10 +0200 Subject: [PATCH 2/2] Feedback: Remove bottom spacer This should be fixed for all nodes. --- source/blender/nodes/shader/nodes/node_shader_tangent.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/blender/nodes/shader/nodes/node_shader_tangent.cc b/source/blender/nodes/shader/nodes/node_shader_tangent.cc index 49b767a9c18..ba48bf69650 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tangent.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tangent.cc @@ -44,8 +44,6 @@ static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA * uiItemR( layout, ptr, "axis", UI_ITEM_R_SPLIT_EMPTY_NAME | UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } - - uiItemS(layout); } static void node_shader_init_tangent(bNodeTree * /*ntree*/, bNode *node) -- 2.30.2