[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55238] trunk/blender/source/blender/ editors/space_node/drawnode.c: Fix node group drawing not taking into account DPI properly.

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Mar 13 15:19:57 CET 2013


Revision: 55238
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55238
Author:   blendix
Date:     2013-03-13 14:19:57 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
Fix node group drawing not taking into account DPI properly.

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	2013-03-13 14:19:55 UTC (rev 55237)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2013-03-13 14:19:57 UTC (rev 55238)
@@ -687,14 +687,14 @@
 static void draw_group_socket(const bContext *C, SpaceNode *snode, bNodeTree *ntree, bNode *gnode,
                               bNodeSocket *sock, bNodeSocket *gsock, int index, int in_out)
 {
-	const float dpi_fac = 1.0f;
+	const float dpi_fac = UI_DPI_FAC;
 	bNodeTree *ngroup = (bNodeTree *)gnode->id;
 	bNodeSocketType *stype = ntreeGetSocketType(gsock ? gsock->type : sock->type);
 	uiBut *bt;
 	float offset;
 	int draw_value;
 	const float node_group_frame = NODE_GROUP_FRAME * dpi_fac;
-	const float socket_size      = NODE_SOCKSIZE * dpi_fac;
+	const float socket_size      = NODE_SOCKSIZE;
 	const float arrowbutw        = 0.8f * UI_UNIT_X;
 	const short co_text_w = 72 * dpi_fac;
 	const float co_margin = 6.0f * dpi_fac;
@@ -799,12 +799,12 @@
 		uiLayout *layout;
 		PointerRNA ptr;
 		rctf rect = gnode->totr;
-		const float dpi_fac = 1.0f;
+		const float dpi_fac = UI_DPI_FAC;
 		const float node_group_frame = NODE_GROUP_FRAME * dpi_fac;
 		const float group_header = 26 * dpi_fac;
 		
 		int index;
-		
+
 		/* backdrop header */
 		glEnable(GL_BLEND);
 		uiSetRoundBox(UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT);




More information about the Bf-blender-cvs mailing list