diff options
author | Ton Roosendaal <ton@blender.org> | 2011-02-18 20:53:11 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2011-02-18 20:53:11 +0300 |
commit | 7a8a9b48755c7a7834b391cbc47391e51fc666d9 (patch) | |
tree | 15a00d8b06278ca03a61157c2074e1dcc4b32aa9 /source | |
parent | 7a29a44cf4b6a8c8b771ac39cf9234f7f5149acd (diff) |
Bugfix #26101
Node editor: icons in header sometimes were on wrong locations.
The click hotspots were also off...
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_node/node_draw.c | 6 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_state.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 2d54353cb90..7b9a33c521f 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -665,8 +665,8 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN uiSetRoundBox(3); uiRoundBox(rct->xmin, rct->ymax-NODE_DY, rct->xmax, rct->ymax, BASIS_RAD); - /* show/hide icons, note this sequence is copied in editnode.c */ - iconofs= rct->xmax; + /* show/hide icons, note this sequence is copied in do_header_node() node_state.c */ + iconofs= rct->xmax - 7.0f; if(node->typeinfo->flag & NODE_PREVIEW) { int icon_id; @@ -675,7 +675,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN icon_id= ICON_MATERIAL; else icon_id= ICON_MATERIAL_DATA; - iconofs-=22.0f; + iconofs-=15.0f; uiDefIconBut(node->block, LABEL, B_REDR, icon_id, iconofs, rct->ymax-NODE_DY, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 1.0, 0.5, ""); } diff --git a/source/blender/editors/space_node/node_state.c b/source/blender/editors/space_node/node_state.c index 4f2f204fbe6..332080f023c 100644 --- a/source/blender/editors/space_node/node_state.c +++ b/source/blender/editors/space_node/node_state.c @@ -117,21 +117,21 @@ static int do_header_node(SpaceNode *snode, bNode *node, float mx, float my) node->flag ^= NODE_PREVIEW; return 1; } - totr.xmin-=18.0f; + totr.xmin-=15.0f; } if(node->type == NODE_GROUP) { if(BLI_in_rctf(&totr, mx, my)) { snode_make_group_editable(snode, node); return 1; } - totr.xmin-=18.0f; + totr.xmin-=15.0f; } if(node->typeinfo->flag & NODE_OPTIONS) { if(BLI_in_rctf(&totr, mx, my)) { node->flag ^= NODE_OPTIONS; return 1; } - totr.xmin-=18.0f; + totr.xmin-=15.0f; } /* hide unused sockets */ if(BLI_in_rctf(&totr, mx, my)) { |