[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48766] trunk/blender/source/blender/ editors/space_node: improve node text alignment with different zoom levels
Campbell Barton
ideasman42 at gmail.com
Mon Jul 9 21:50:43 CEST 2012
Revision: 48766
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48766
Author: campbellbarton
Date: 2012-07-09 19:50:43 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
improve node text alignment with different zoom levels
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_node/node_intern.h
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-07-09 19:33:25 UTC (rev 48765)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-07-09 19:50:43 UTC (rev 48766)
@@ -216,15 +216,17 @@
int ofs = 0;
const char *ui_name = IFACE_(name);
UI_ThemeColor(TH_TEXT);
- slen = snode->aspect_sqrt * UI_GetStringWidth(ui_name);
+ slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X) * snode->aspect_sqrt;
while (slen > node->width) {
ofs++;
- slen = snode->aspect_sqrt * UI_GetStringWidth(ui_name + ofs);
+ slen = (UI_GetStringWidth(ui_name + ofs) + NODE_MARGIN_X) * snode->aspect_sqrt;
}
uiDefBut(block, LABEL, 0, ui_name + ofs,
- (int)(sock->locx - (15.0f * snode->aspect_sqrt) - slen), (int)(sock->locy - 9.0f),
+ (int)(sock->locx - slen), (int)(sock->locy - 9.0f),
(short)(node->width - NODE_DY), (short)NODE_DY,
NULL, 0, 0, 0, 0, "");
+
+ (void)snode;
}
/* ****************** BASE DRAW FUNCTIONS FOR NEW OPERATOR NODES ***************** */
@@ -830,7 +832,7 @@
UI_ThemeColor(TH_TEXT_HI);
layout = uiBlockLayout(gnode->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL,
- (int)(rect.xmin + 15), (int)(rect.ymax + group_header),
+ (int)(rect.xmin + NODE_MARGIN_X), (int)(rect.ymax + group_header),
MIN2((int)(rect.xmax - rect.xmin - 18.0f), node_group_frame + 20), group_header, UI_GetStyle());
RNA_pointer_create(&ntree->id, &RNA_Node, gnode, &ptr);
uiTemplateIDBrowse(layout, (bContext *)C, &ptr, "node_tree", NULL, NULL, NULL);
Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c 2012-07-09 19:33:25 UTC (rev 48765)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c 2012-07-09 19:50:43 UTC (rev 48766)
@@ -798,7 +798,7 @@
// BLI_snprintf(showname, sizeof(showname), "[%s]", showname); // XXX - don't print into self!
uiDefBut(node->block, LABEL, 0, showname,
- (int)(rct->xmin + 15), (int)(rct->ymax - NODE_DY),
+ (int)(rct->xmin + (NODE_MARGIN_X / snode->aspect_sqrt)), (int)(rct->ymax - NODE_DY),
(short)(iconofs - rct->xmin - 18.0f), (short)NODE_DY,
NULL, 0, 0, 0, 0, "");
@@ -841,7 +841,7 @@
node_socket_circle_draw(ntree, sock, NODE_SOCKSIZE, sock->flag & SELECT);
node->typeinfo->drawinputfunc(C, node->block, ntree, node, sock, IFACE_(sock->name),
- sock->locx+NODE_DYS, sock->locy-NODE_DYS, node->width-NODE_DY);
+ sock->locx + (NODE_DYS / snode->aspect_sqrt), sock->locy-NODE_DYS, node->width-NODE_DY);
}
/* socket outputs */
@@ -852,7 +852,7 @@
node_socket_circle_draw(ntree, sock, NODE_SOCKSIZE, sock->flag & SELECT);
node->typeinfo->drawoutputfunc(C, node->block, ntree, node, sock, IFACE_(sock->name),
- sock->locx-node->width+NODE_DYS, sock->locy-NODE_DYS, node->width-NODE_DY);
+ sock->locx - node->width + (NODE_DYS / snode->aspect_sqrt), sock->locy-NODE_DYS, node->width-NODE_DY);
}
/* preview */
@@ -949,7 +949,7 @@
// BLI_snprintf(showname, sizeof(showname), "[%s]", showname); // XXX - don't print into self!
uiDefBut(node->block, LABEL, 0, showname,
- (int)(rct->xmin + 15), (int)(centy - 10),
+ (int)(rct->xmin + (NODE_MARGIN_X / snode->aspect_sqrt)), (int)(centy - 10),
(short)(rct->xmax - rct->xmin-18.0f -12.0f), (short)NODE_DY,
NULL, 0, 0, 0, 0, "");
}
Modified: trunk/blender/source/blender/editors/space_node/node_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_intern.h 2012-07-09 19:33:25 UTC (rev 48765)
+++ trunk/blender/source/blender/editors/space_node/node_intern.h 2012-07-09 19:50:43 UTC (rev 48766)
@@ -196,6 +196,7 @@
#define BASIS_RAD 8.0f
#define NODE_DYS (U.widget_unit/2)
#define NODE_DY U.widget_unit
+#define NODE_MARGIN_X 15
#define NODE_SOCKSIZE 5
// XXX button events (butspace)
More information about the Bf-blender-cvs
mailing list