[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56283] trunk/blender/source/blender/ editors: Fix two more high DPI / retina draw issues with running jobs in info header and

[Brecht Van Lommel]

Revision: 56283
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56283
Author:   blendix
Date:     2013-04-24 23:09:29 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
Fix two more high DPI / retina draw issues with running jobs in info header and
the node tree name in the node editor.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/editors/space_node/node_draw.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2013-04-24 23:09:25 UTC (rev 56282)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2013-04-24 23:09:29 UTC (rev 56283)
@@ -2877,15 +2877,15 @@
 		uiDefIconBut(block, BUT, handle_event, ICON_PANEL_CLOSE, 0, UI_UNIT_Y * 0.1, UI_UNIT_X * 0.8, UI_UNIT_Y * 0.8,
 		             NULL, 0.0f, 0.0f, 0, 0, TIP_("Stop this job"));
 		uiDefBut(block, PROGRESSBAR, 0, WM_jobs_name(wm, owner), 
-		         UI_UNIT_X, 0, 100, UI_UNIT_Y, NULL, 0.0f, 0.0f, WM_jobs_progress(wm, owner), 0, TIP_("Progress"));
+		         UI_UNIT_X, 0, UI_UNIT_X * 5.0f, UI_UNIT_Y, NULL, 0.0f, 0.0f, WM_jobs_progress(wm, owner), 0, TIP_("Progress"));
 		
 		uiLayoutRow(layout, FALSE);
 	}
 	if (WM_jobs_test(wm, screen, WM_JOB_TYPE_SCREENCAST))
-		uiDefIconTextBut(block, BUT, B_STOPCAST, ICON_CANCEL, IFACE_("Capture"), 0, 0, 85, UI_UNIT_Y,
+		uiDefIconTextBut(block, BUT, B_STOPCAST, ICON_CANCEL, IFACE_("Capture"), 0, 0, UI_UNIT_X * 4.25f, UI_UNIT_Y,
 		                 NULL, 0.0f, 0.0f, 0, 0, TIP_("Stop screencast"));
 	if (screen->animtimer)
-		uiDefIconTextBut(block, BUT, B_STOPANIM, ICON_CANCEL, IFACE_("Anim Player"), 0, 0, 100, UI_UNIT_Y,
+		uiDefIconTextBut(block, BUT, B_STOPANIM, ICON_CANCEL, IFACE_("Anim Player"), 0, 0, UI_UNIT_X * 5.0f, UI_UNIT_Y,
 		                 NULL, 0.0f, 0.0f, 0, 0, TIP_("Stop animation playback"));
 }
 

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c	2013-04-24 23:09:25 UTC (rev 56282)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2013-04-24 23:09:29 UTC (rev 56283)
@@ -1197,7 +1197,7 @@
 	ED_node_tree_path_get_fixedbuf(snode, info, sizeof(info));
 	
 	UI_ThemeColor(TH_TEXT_HI);
-	BLF_draw_default(30, 30, 0.0f, info, sizeof(info));
+	BLF_draw_default(1.5f * UI_UNIT_X, 1.5f * UI_UNIT_Y, 0.0f, info, sizeof(info));
 }
 
 static void snode_setup_v2d(SpaceNode *snode, ARegion *ar, float center[2])