r4761 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-15 01:59:53 -0400 (Wed, 15 Oct 2008)
New Revision: 4761

Modified:
   trunk/data/qcsrc/client/sbar.qc
Log:
add the width of a space between icons and text of the same column


Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2008-10-15 05:54:29 UTC (rev 4760)
+++ trunk/data/qcsrc/client/sbar.qc	2008-10-15 05:59:53 UTC (rev 4761)
@@ -701,7 +701,7 @@
 
 string Sbar_FixScoreboardColumnWidth(float i, string str)
 {
-	float field, maxsize, j;
+	float field, maxsize, j, f;
 	vector sz;
 	field = sbar_field[i];
 
@@ -722,22 +722,31 @@
 	if(sbar_field_icon0 != "")
 	{
 		sz = drawgetimagesize(sbar_field_icon0);
-		if(sbar_fixscoreboardcolumnwidth_iconlen < sz_x / sz_y)
-			sbar_fixscoreboardcolumnwidth_iconlen = sz_x / sz_y;
+		f = sz_x / sz_y;
+		if(str != "")
+			f += stringwidth(" ", FALSE);
+		if(sbar_fixscoreboardcolumnwidth_iconlen < f)
+			sbar_fixscoreboardcolumnwidth_iconlen = f;
 	}
 
 	if(sbar_field_icon1 != "")
 	{
 		sz = drawgetimagesize(sbar_field_icon1);
-		if(sbar_fixscoreboardcolumnwidth_iconlen < sz_x / sz_y)
-			sbar_fixscoreboardcolumnwidth_iconlen = sz_x / sz_y;
+		f = sz_x / sz_y;
+		if(str != "")
+			f += stringwidth(" ", FALSE);
+		if(sbar_fixscoreboardcolumnwidth_iconlen < f)
+			sbar_fixscoreboardcolumnwidth_iconlen = f;
 	}
 
 	if(sbar_field_icon2 != "")
 	{
 		sz = drawgetimagesize(sbar_field_icon2);
-		if(sbar_fixscoreboardcolumnwidth_iconlen < sz_x / sz_y)
-			sbar_fixscoreboardcolumnwidth_iconlen = sz_x / sz_y;
+		f = sz_x / sz_y;
+		if(str != "")
+			f += stringwidth(" ", FALSE);
+		if(sbar_fixscoreboardcolumnwidth_iconlen < f)
+			sbar_fixscoreboardcolumnwidth_iconlen = f;
 	}
 
 	sbar_fixscoreboardcolumnwidth_iconlen *= sbar_fontsize_y / sbar_fontsize_x; // fix icon aspect