[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48780] trunk/blender/source/blender/ editors/space_node/drawnode.c: ugh, previous commit didnt work well with DPI other then 72
Campbell Barton
ideasman42 at gmail.com
Tue Jul 10 01:28:49 CEST 2012
Revision: 48780
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48780
Author: campbellbarton
Date: 2012-07-09 23:28:49 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
ugh, previous commit didnt work well with DPI other then 72
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/drawnode.c
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-07-09 23:23:47 UTC (rev 48779)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-07-09 23:28:49 UTC (rev 48780)
@@ -785,8 +785,9 @@
uiLayout *layout;
PointerRNA ptr;
rctf rect = gnode->totr;
- float node_group_frame = U.dpi * NODE_GROUP_FRAME / 72;
- float group_header = 26 * U.dpi / 72;
+ const float dpi_fac = U.dpi / 72.0f;
+ float node_group_frame = NODE_GROUP_FRAME * dpi_fac;
+ float group_header = 26 * dpi_fac;
int index;
@@ -841,7 +842,7 @@
UI_ThemeColor(TH_TEXT_HI);
layout = uiBlockLayout(gnode->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL,
- (int)(rect.xmin + NODE_MARGIN_X), (int)(rect.ymax + (group_header - 2)),
+ (int)(rect.xmin + NODE_MARGIN_X), (int)(rect.ymax + (group_header - (2.5f * dpi_fac))),
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);
More information about the Bf-blender-cvs
mailing list