Fix T61577: collapse nodes hide arrow hit zone overlaps with node sockets.
Patch by EitanSomething. Differential Revision: https://developer.blender.org/D4423
This commit is contained in:
parent
489c015e70
commit
0195aad6da
Notes:
blender-bot
2023-02-14 10:14:07 +01:00
Referenced by issue #61577, Active area for node-hider arrow too big and overlaps node input
|
@ -946,18 +946,18 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
|
|||
/* open/close entirely? */
|
||||
{
|
||||
uiBut *but;
|
||||
int but_size = UI_UNIT_X * 1.2f;
|
||||
int but_size = U.widget_unit * 0.8f;
|
||||
/* XXX button uses a custom triangle draw below, so make it invisible without icon */
|
||||
UI_block_emboss_set(node->block, UI_EMBOSS_NONE);
|
||||
but = uiDefBut(node->block, UI_BTYPE_BUT_TOGGLE, B_REDR, "",
|
||||
rct->xmin + 0.6f * U.widget_unit - but_size / 2, rct->ymax - NODE_DY / 2.2f - but_size / 2,
|
||||
rct->xmin + 0.35f * U.widget_unit, rct->ymax - NODE_DY / 2.2f - but_size / 2,
|
||||
but_size, but_size, NULL, 0, 0, 0, 0, "");
|
||||
UI_but_func_set(but, node_toggle_button_cb, node, (void *)"NODE_OT_hide_toggle");
|
||||
UI_block_emboss_set(node->block, UI_EMBOSS);
|
||||
|
||||
UI_GetThemeColor4fv(TH_TEXT, color);
|
||||
/* custom draw function for this button */
|
||||
UI_draw_icon_tri(rct->xmin + 0.6f * U.widget_unit, rct->ymax - NODE_DY / 2.2f, 'v', color);
|
||||
UI_draw_icon_tri(rct->xmin + 0.65f * U.widget_unit, rct->ymax - NODE_DY / 2.2f, 'v', color);
|
||||
}
|
||||
|
||||
nodeLabel(ntree, node, showname, sizeof(showname));
|
||||
|
@ -1069,18 +1069,18 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
|
|||
/* open entirely icon */
|
||||
{
|
||||
uiBut *but;
|
||||
int but_size = UI_UNIT_X * 1.2f;
|
||||
int but_size = U.widget_unit * 0.8f;
|
||||
/* XXX button uses a custom triangle draw below, so make it invisible without icon */
|
||||
UI_block_emboss_set(node->block, UI_EMBOSS_NONE);
|
||||
but = uiDefBut(node->block, UI_BTYPE_BUT_TOGGLE, B_REDR, "",
|
||||
rct->xmin + 10.0f - but_size / 2, centy - but_size / 2,
|
||||
rct->xmin + 0.35f * U.widget_unit, centy - but_size / 2,
|
||||
but_size, but_size, NULL, 0, 0, 0, 0, "");
|
||||
UI_but_func_set(but, node_toggle_button_cb, node, (void *)"NODE_OT_hide_toggle");
|
||||
UI_block_emboss_set(node->block, UI_EMBOSS);
|
||||
|
||||
UI_GetThemeColor4fv(TH_TEXT, color);
|
||||
/* custom draw function for this button */
|
||||
UI_draw_icon_tri(rct->xmin + 10.0f, centy, 'h', color);
|
||||
UI_draw_icon_tri(rct->xmin + 0.65f * U.widget_unit, centy, 'h', color);
|
||||
}
|
||||
|
||||
/* disable lines */
|
||||
|
|
Loading…
Reference in New Issue