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

Fix crash in drawing socket names when zooming out a lot

Browse Source 
--
svn merge -r49291:49292 ^/branches/soc-2011-tomato
This commit is contained in:
Sergey Sharybin
2012-07-27 13:49:55 +00:00
parent abeeebd089
commit f230a94d49
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,16 +217,20 @@ static void node_draw_output_default(const bContext *C, uiBlock *block,
float slen;
int ofs = 0;
const char *ui_name = IFACE_(name);
int len = strlen(ui_name);
UI_ThemeColor(TH_TEXT);
slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X) * snode->aspect_sqrt;
while (slen > node->width) {
while (slen > node->width && ofs < len) {
ofs++;
slen = (UI_GetStringWidth(ui_name + ofs) + NODE_MARGIN_X) * snode->aspect_sqrt;
}
uiDefBut(block, LABEL, 0, ui_name + ofs,
(int)(sock->locx - slen), (int)(sock->locy - 9.0f),
(short)(node->width - NODE_DY), (short)NODE_DY,
NULL, 0, 0, 0, 0, "");
if (ofs < len) {
uiDefBut(block, LABEL, 0, ui_name + ofs,
(int)(sock->locx - slen), (int)(sock->locy - 9.0f),
(short)(node->width - NODE_DY), (short)NODE_DY,
NULL, 0, 0, 0, 0, "");
}
(void)snode;
}