X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Flabel.c;h=8406af01f6be3e68f3ab80260641d7d1145cf93c;hb=5d84c659e4c2c51c996b5330fa19c8a24887e42d;hp=e1543ce2756f60579cf1eeb1b5c79be924bc5a7b;hpb=3618a0f2000f064d6f59b99c7b79d7a3c25f77b9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item/label.c b/qcsrc/menu/item/label.c
index e1543ce27..8406af01f 100644
--- a/qcsrc/menu/item/label.c
+++ b/qcsrc/menu/item/label.c
@@ -6,7 +6,9 @@ CLASS(Label) EXTENDS(Item)
 	METHOD(Label, setText, void(entity, string))
 	METHOD(Label, toString, string(entity))
 	METHOD(Label, recalcPositionWithText, void(entity, string))
+	ATTRIB(Label, isBold, float, 0)
 	ATTRIB(Label, text, string, string_null)
+	ATTRIB(Label, currentText, string, string_null)
 	ATTRIB(Label, fontSize, float, 8)
 	ATTRIB(Label, align, float, 0.5)
 	ATTRIB(Label, allowCut, float, 0)
@@ -38,13 +40,22 @@ string Label_toString(entity me)
 void Label_setText(entity me, string txt)
 {
 	me.text = txt;
-	me.recalcPos = 1;
+	if(txt != me.currentText)
+	{
+		if(me.currentText)
+			strunzone(me.currentText);
+		me.currentText = strzone(txt);
+		me.recalcPos = 1;
+	}
 }
 void Label_recalcPositionWithText(entity me, string t)
 {
 	float spaceAvail;
 	spaceAvail = 1 - me.keepspaceLeft - me.keepspaceRight;
 
+	if(me.isBold)
+		draw_beginBoldFont();
+
 	float spaceUsed;
 	spaceUsed = draw_TextWidth(t, me.allowColors, me.realFontSize);
 
@@ -68,7 +79,7 @@ void Label_recalcPositionWithText(entity me, string t)
 			me.realOrigin_x = me.keepspaceLeft;
 		if(!me.overrideCondenseFactor)
 			me.condenseFactor = spaceAvail / spaceUsed;
-		dprint(sprintf(_("NOTE: label text %s too wide for label, condensed by factor %f\n"), t, me.condenseFactor));
+		dprintf(_("NOTE: label text %s too wide for label, condensed by factor %f\n"), t, me.condenseFactor);
 	}
 
 	if(!me.overrideRealOrigin_y)
@@ -107,6 +118,9 @@ void Label_recalcPositionWithText(entity me, string t)
 		me.realOrigin_y = 0.5 * (1 - lines * me.realFontSize_y);
 	}
 
+	if(me.isBold)
+		draw_endBoldFont();
+
 	me.recalcPos = 0;
 }
 void Label_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
@@ -139,7 +153,13 @@ void Label_draw(entity me)
 	if(me.textEntity)
 	{
 		t = me.textEntity.toString(me.textEntity);
-		me.recalcPos = 1;
+		if(t != me.currentText)
+		{
+			if(me.currentText)
+				strunzone(me.currentText);
+			me.currentText = strzone(t);
+			me.recalcPos = 1;
+		}
 	}
 	else
 		t = me.text;
@@ -153,6 +173,9 @@ void Label_draw(entity me)
 			vector dfs;
 			vector fs;
 
+			if(me.isBold)
+				draw_beginBoldFont();
+
 			// set up variables to draw in condensed size, but use hinting for original size
 			fs = me.realFontSize;
 			fs_x *= me.condenseFactor;
@@ -180,6 +203,9 @@ void Label_draw(entity me)
 				draw_Text(me.realOrigin, t, fs, me.colorL, me.alpha, me.allowColors);
 
 			draw_fontscale = dfs;
+
+			if(me.isBold)
+				draw_endBoldFont();
 		}
 
 	SUPER(Label).draw(me);