[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33686] trunk/blender/source/blender/ editors/space_file/file_draw.c: Bugfix #25231

[Ton Roosendaal]

Revision: 33686
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33686
Author:   ton
Date:     2010-12-15 16:56:06 +0100 (Wed, 15 Dec 2010)

Log Message:
-----------
Bugfix #25231

File Window: text clipping was tiny bit too narrow. It was also
clipping text twice even ;)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/file_draw.c

Modified: trunk/blender/source/blender/editors/space_file/file_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_draw.c	2010-12-15 15:28:03 UTC (rev 33685)
+++ trunk/blender/source/blender/editors/space_file/file_draw.c	2010-12-15 15:56:06 UTC (rev 33686)
@@ -26,6 +26,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <math.h>
 #include <string.h>
 
 #include "BLI_blenlib.h"
@@ -292,20 +293,18 @@
 
 static void file_draw_string(int sx, int sy, const char* string, float width, int height, short align)
 {
-	char fname[FILE_MAXFILE];
-	rcti rect;
-	float sw;
 	uiStyle *style= U.uistyles.first;
 	uiFontStyle fs = style->widgetlabel;
+	rcti rect;
+	char fname[FILE_MAXFILE];
 
 	fs.align = align;
 
 	BLI_strncpy(fname,string, FILE_MAXFILE);
-	sw = file_shorten_string(fname, width+1, 0 );
-
-
+	
+	/* no text clipping needed, uiStyleFontDraw does it but is a bit too strict (for buttons it works) */
 	rect.xmin = sx;
-	rect.xmax = sx + width;
+	rect.xmax = sx + ceil(width+4.0f);
 	rect.ymin = sy - height;
 	rect.ymax = sy;