sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix drawing of output slots with utf-8 names. Also always show last letters in already clipped output slots names

Browse Source
This commit is contained in:
Sv. Lockal 2012-09-16 19:06:17 +00:00
parent 237a9fde92
commit b1d1355f30
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,25 +200,22 @@ static void node_draw_output_default(const bContext *C, uiBlock *block,
const char *name, int UNUSED(x), int UNUSED(y), int UNUSED(width)) const char *name, int UNUSED(x), int UNUSED(y), int UNUSED(width))
{ {
SpaceNode *snode = CTX_wm_space_node(C); SpaceNode *snode = CTX_wm_space_node(C);
float slen;
int ofs = 0;
const char *ui_name = IFACE_(name); const char *ui_name = IFACE_(name);
int len = strlen(ui_name); float slen;
UI_ThemeColor(TH_TEXT); UI_ThemeColor(TH_TEXT);
slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X) * snode->aspect_sqrt; slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X) * snode->aspect_sqrt;
while (slen > node->width && ofs < len) { while (slen > node->width && *ui_name) {
ofs++; ui_name = BLI_str_find_next_char_utf8(ui_name, NULL);
slen = (UI_GetStringWidth(ui_name + ofs) + NODE_MARGIN_X) * snode->aspect_sqrt; slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X) * snode->aspect_sqrt;
} }
if (ofs < len) { if (*ui_name) {
uiDefBut(block, LABEL, 0, ui_name + ofs, uiDefBut(block, LABEL, 0, ui_name,
(int)(sock->locx - slen), (int)(sock->locy - 9.0f), (int)(sock->locx - slen), (int)(sock->locy - 9.0f),
(short)(node->width - NODE_DY), (short)NODE_DY, (short)slen, (short)NODE_DY,
NULL, 0, 0, 0, 0, ""); NULL, 0, 0, 0, 0, "");
} }
(void)snode;
} }
/* ****************** BASE DRAW FUNCTIONS FOR NEW OPERATOR NODES ***************** */ /* ****************** BASE DRAW FUNCTIONS FOR NEW OPERATOR NODES ***************** */