archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix node drawing glitch where text alignment for output sockets would move the text X axis twice as much as it should have.

Browse Source
This commit is contained in:
Campbell Barton
2012-07-09 16:51:08 +00:00
parent 80fa54ab3c
commit a1d5261951
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/editors/space_node/drawnode.c
View File

@@ -216,12 +216,12 @@ static void node_draw_output_default(const bContext *C, uiBlock *block,
int ofs = 0;
const char *ui_name = IFACE_(name);
UI_ThemeColor(TH_TEXT);
slen = snode->aspect * UI_GetStringWidth(ui_name);
slen = snode->aspect_sqrt * UI_GetStringWidth(ui_name);
while (slen > node->width) {
ofs++;
slen = snode->aspect * UI_GetStringWidth(ui_name + ofs);
slen = snode->aspect_sqrt * UI_GetStringWidth(ui_name + ofs);
}
uiDefBut(block, LABEL, 0, ui_name + ofs, (short)(sock->locx - 15.0f - slen), (short)(sock->locy - 9.0f),
uiDefBut(block, LABEL, 0, ui_name + ofs, (short)(sock->locx - (15.0f * snode->aspect_sqrt) - slen), (short)(sock->locy - 9.0f),
(short)(node->width - NODE_DY), NODE_DY, NULL, 0, 0, 0, 0, "");
}
@@ -3178,17 +3178,16 @@ void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link, int t
drawarrow = (link->tonode && (link->tonode->type == NODE_REROUTE)) && (link->fromnode && (link->fromnode->type == NODE_REROUTE));
if (drawarrow) {
// draw arrow in line segment LINK_ARROW
float dx, dy, len;
dx = coord_array[LINK_ARROW][0]-coord_array[LINK_ARROW-1][0];
dy = coord_array[LINK_ARROW][1]-coord_array[LINK_ARROW-1][1];
len = sqrtf(dx*dx+dy*dy);
dx = dx /len*ARROW_SIZE;
dy = dy /len*ARROW_SIZE;
arrow1[0] = coord_array[LINK_ARROW][0]-dx+dy;
arrow1[1] = coord_array[LINK_ARROW][1]-dy-dx;
arrow2[0] = coord_array[LINK_ARROW][0]-dx-dy;
arrow2[1] = coord_array[LINK_ARROW][1]-dy+dx;
/* draw arrow in line segment LINK_ARROW */
float d_xy[2], len;
sub_v2_v2v2(d_xy, coord_array[LINK_ARROW], coord_array[LINK_ARROW - 1]);
len = len_v2(d_xy);
mul_v2_fl(d_xy, 1.0f / (len * ARROW_SIZE));
arrow1[0] = coord_array[LINK_ARROW][0] - d_xy[0] + d_xy[1];
arrow1[1] = coord_array[LINK_ARROW][1] - d_xy[1] - d_xy[0];
arrow2[0] = coord_array[LINK_ARROW][0] - d_xy[0] - d_xy[1];
arrow2[1] = coord_array[LINK_ARROW][1] - d_xy[1] + d_xy[0];
arrow[0] = coord_array[LINK_ARROW][0];
arrow[1] = coord_array[LINK_ARROW][1];
}

3
source/blender/editors/space_node/node_draw.c
View File

@@ -1109,7 +1109,8 @@ void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d)
glEnable(GL_MAP1_VERTEX_3);
/* aspect+font, set each time */
snode->aspect= (v2d->cur.xmax - v2d->cur.xmin)/((float)ar->winx);
snode->aspect = (v2d->cur.xmax - v2d->cur.xmin) / ((float)ar->winx);
snode->aspect_sqrt = sqrtf(snode->aspect);
// XXX snode->curfont= uiSetCurFont_ext(snode->aspect);
/* grid */

4
source/blender/makesdna/DNA_space_types.h
View File

@@ -856,10 +856,10 @@ typedef struct SpaceNode {
struct ID *id, *from; /* context, no need to save in file? well... pinning... */
short flag, pad1; /* menunr: browse id block in header */
float aspect;
float aspect, aspect_sqrt;
float xof, yof; /* offset for drawing the backdrop */
float zoom, padf; /* zoom for backdrop */
float zoom; /* zoom for backdrop */
float mx, my; /* mousepos for drawing socketless link */
struct bNodeTree *nodetree, *edittree;