[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33422] trunk/blender/source/blender/ editors/space_image: use fixed width fonts for image stat display.

[Campbell Barton]

Revision: 33422
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33422
Author:   campbellbarton
Date:     2010-12-02 05:23:56 +0100 (Thu, 02 Dec 2010)

Log Message:
-----------
use fixed width fonts for image stat display.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/CMakeLists.txt
    trunk/blender/source/blender/editors/space_image/SConscript
    trunk/blender/source/blender/editors/space_image/image_draw.c

Modified: trunk/blender/source/blender/editors/space_image/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_image/CMakeLists.txt	2010-12-02 04:06:02 UTC (rev 33421)
+++ trunk/blender/source/blender/editors/space_image/CMakeLists.txt	2010-12-02 04:23:56 UTC (rev 33422)
@@ -21,6 +21,7 @@
 
 SET(INC
 	../include
+	../../blenfont
 	../../blenkernel
 	../../blenlib
 	../../imbuf

Modified: trunk/blender/source/blender/editors/space_image/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_image/SConscript	2010-12-02 04:06:02 UTC (rev 33421)
+++ trunk/blender/source/blender/editors/space_image/SConscript	2010-12-02 04:23:56 UTC (rev 33422)
@@ -3,7 +3,7 @@
 
 sources = env.Glob('*.c')
 
-incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../render/extern/include ../../makesrna'
 

Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_draw.c	2010-12-02 04:06:02 UTC (rev 33421)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c	2010-12-02 04:23:56 UTC (rev 33422)
@@ -56,6 +56,8 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "BLF_api.h"
+
 #include "ED_gpencil.h"
 #include "ED_image.h"
 
@@ -127,9 +129,9 @@
 	char str[256];
 	int ofs;
 	
-	ofs= sprintf(str, "X: %d Y: %d ", x, y);
+	ofs= sprintf(str, "X: %4d Y: %4d ", x, y);
 	if(cp)
-		ofs+= sprintf(str+ofs, "| R: %d G: %d B: %d A: %d ", cp[0], cp[1], cp[2], cp[3]);
+		ofs+= sprintf(str+ofs, "| R: %3d G: %3d B: %3d A: %3d ", cp[0], cp[1], cp[2], cp[3]);
 
 	if(fp) {
 		if(channels==4)
@@ -149,12 +151,17 @@
 	glEnable(GL_BLEND);
 	
 	glColor4f(.0,.0,.0,.25);
-	glRectf(0.0, 0.0, ar->winrct.xmax - ar->winrct.xmin + 1, 30.0);
+	glRecti(0.0, 0.0, ar->winrct.xmax - ar->winrct.xmin + 1, 20);
 	glDisable(GL_BLEND);
 	
 	glColor3ub(255, 255, 255);
 	
-	UI_DrawString(10, 10, str);
+	// UI_DrawString(6, 6, str); // works ok but fixed width is nicer.
+	BLF_aspect(blf_mono_font, 1.0);
+	BLF_size(blf_mono_font, 11, 72);
+	BLF_position(blf_mono_font, 6, 6, 0);
+	BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+	
 }
 
 /* image drawing */