blender/blender
168
526
Fork 800
Code Issues 6.6k Pull Requests 957 Projects 21 Wiki Activity

Node Editor: Improve padding around buttons and sockets #118972

Merged
Leon Schittek merged 1 commits from lone_noel/blender:node-layout-padding into main 2024-03-22 09:09:59 +01:00
Conversation 1 Commits 1 Files Changed 1 +9 -10
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/space_node/node_draw.cc
View File

@ -908,13 +908,8 @@ static void node_update_basis_from_declaration(
static void node_update_basis_from_socket_lists(
const bContext &C, bNodeTree &ntree, bNode &node, uiBlock &block, const int locx, int &locy)
{
const bool node_options = node.typeinfo->draw_buttons && (node.flag & NODE_OPTIONS);
const bool inputs_first = node.inputs.first && !(node.outputs.first || node_options);
/* Add a little bit of padding above the top socket. */
if (node.outputs.first || inputs_first) {
locy -= NODE_DYS / 2;
}
/* Space at the top. */
locy -= NODE_DYS / 2;
/* Output sockets. */
bool add_output_space = false;
@ -935,7 +930,10 @@ static void node_update_basis_from_socket_lists(
locy -= NODE_DY / 4;
}
node_update_basis_buttons(C, ntree, node, node.typeinfo->draw_buttons, block, locy);
const bool add_button_space = node_update_basis_buttons(
C, ntree, node, node.typeinfo->draw_buttons, block, locy);
bool add_input_space = false;
/* Input sockets. */
for (bNodeSocket *socket : node.input_sockets()) {
@ -946,11 +944,12 @@ static void node_update_basis_from_socket_lists(
if (socket->next) {
locy -= NODE_ITEM_SPACING_Y;
}
add_input_space = true;
}
}
/* Little bit of space in end. */
if (node.inputs.first || (node.flag & NODE_OPTIONS) == 0) {
/* Little bit of padding at the bottom. */
if (add_input_space || add_button_space) {
locy -= NODE_DYS / 2;
}
}