X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Flabel.c;h=e3a6bee409897fb494704607e93db32da15af739;hb=8249c3a8e3cb9b205f707caacf8756f651772a61;hp=5a6bb1c69745efc4d67333b73b08a99226f29b15;hpb=1d02a7ca9ba75edf897d843e7dfb5635ad7dd23f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item/label.c b/qcsrc/menu/item/label.c
index 5a6bb1c69..e3a6bee40 100644
--- a/qcsrc/menu/item/label.c
+++ b/qcsrc/menu/item/label.c
@@ -5,6 +5,7 @@ CLASS(Label) EXTENDS(Item)
 	METHOD(Label, resizeNotify, void(entity, vector, vector, vector, vector))
 	METHOD(Label, setText, void(entity, string))
 	METHOD(Label, toString, string(entity))
+	METHOD(Label, recalcPosition, void(entity))
 	ATTRIB(Label, text, string, string_null)
 	ATTRIB(Label, fontSize, float, 8)
 	ATTRIB(Label, align, float, 0.5)
@@ -22,6 +23,8 @@ CLASS(Label) EXTENDS(Item)
 	ATTRIB(Label, disabledAlpha, float, 0.3)
 	ATTRIB(Label, textEntity, entity, NULL)
 	ATTRIB(Label, allowWrap, float, 0)
+	ATTRIB(Label, recalcPos, float, 0)
+	ATTRIB(Label, condenseFactor, float, 1)
 ENDCLASS(Label)
 #endif
 
@@ -33,7 +36,33 @@ string Label_toString(entity me)
 void Label_setText(entity me, string txt)
 {
 	me.text = txt;
-	me.realOrigin_x = me.align * (1 - me.keepspaceLeft - me.keepspaceRight - min(draw_TextWidth(me.text, me.allowColors, me.realFontSize), (1 - me.keepspaceLeft - me.keepspaceRight))) + me.keepspaceLeft;
+	me.recalcPos = 1;
+}
+void Label_recalcPosition(entity me)
+{
+	float spaceAvail;
+	spaceAvail = 1 - me.keepspaceLeft - me.keepspaceRight;
+
+	float spaceUsed;
+	spaceUsed = draw_TextWidth(me.text, me.allowColors, me.realFontSize);
+
+	if(spaceUsed <= spaceAvail)
+	{
+		me.realOrigin_x = me.align * (spaceAvail - spaceUsed) + me.keepspaceLeft;
+		me.condenseFactor = 1;
+	}
+	else if(me.allowCut || me.allowWrap)
+	{
+		me.realOrigin_x = me.keepspaceLeft;
+		me.condenseFactor = 1;
+	}
+	else
+	{
+		me.realOrigin_x = me.keepspaceLeft;
+		me.condenseFactor = spaceAvail / spaceUsed;
+		dprint(sprintf(_("NOTE: label text %s too wide for label, condensed by factor %f\n"), me.text, me.condenseFactor));
+	}
+	me.recalcPos = 0;
 }
 void Label_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
@@ -45,8 +74,42 @@ void Label_resizeNotify(entity me, vector relOrigin, vector relSize, vector absO
 		me.keepspaceLeft = me.marginLeft * me.realFontSize_x;
 	if(me.marginRight)
 		me.keepspaceRight = me.marginRight * me.realFontSize_x;
-	me.realOrigin_x = me.align * (1 - me.keepspaceLeft - me.keepspaceRight - min(draw_TextWidth(me.text, me.allowColors, me.realFontSize), (1 - me.keepspaceLeft - me.keepspaceRight))) + me.keepspaceLeft;
-	me.realOrigin_y = 0.5 * (1 - me.realFontSize_y);
+
+	me.recalcPosition(me);
+
+	float lines;
+
+	vector dfs;
+	vector fs;
+
+	// set up variables to draw in condensed size, but use hinting for original size
+	fs = me.realFontSize;
+	fs_x *= me.condenseFactor;
+
+	dfs = draw_fontscale;
+	draw_fontscale_x *= me.condenseFactor;
+
+	if(me.allowCut) // FIXME allowCut incompatible with align != 0
+		lines = 1;
+	else if(me.allowWrap) // FIXME allowWrap incompatible with align != 0
+	{
+		getWrappedLine_remaining = me.text;
+		lines = 0;
+		while(getWrappedLine_remaining)
+		{
+			if (me.allowColors)
+				getWrappedLine((1 - me.keepspaceLeft - me.keepspaceRight), fs, draw_TextWidth_WithColors);
+			else
+				getWrappedLine((1 - me.keepspaceLeft - me.keepspaceRight), fs, draw_TextWidth_WithoutColors);
+			++lines;
+		}
+	}
+	else
+		lines = 1;
+
+	draw_fontscale = dfs;
+
+	me.realOrigin_y = 0.5 * (1 - lines * me.realFontSize_y);
 }
 void Label_configureLabel(entity me, string txt, float sz, float algn)
 {
@@ -64,16 +127,29 @@ void Label_draw(entity me)
 	if(me.textEntity)
 	{
 		t = me.textEntity.toString(me.textEntity);
-		me.realOrigin_x = me.align * (1 - me.keepspaceLeft - me.keepspaceRight - min(draw_TextWidth(t, 0, me.realFontSize), (1 - me.keepspaceLeft - me.keepspaceRight))) + me.keepspaceLeft;
+		me.recalcPos = 1;
 	}
 	else
 		t = me.text;
-	
+
+	if(me.recalcPos)
+		me.recalcPosition(me);
+
 	if(me.fontSize)
 		if(t)
 		{
+			vector dfs;
+			vector fs;
+
+			// set up variables to draw in condensed size, but use hinting for original size
+			fs = me.realFontSize;
+			fs_x *= me.condenseFactor;
+
+			dfs = draw_fontscale;
+			draw_fontscale_x *= me.condenseFactor;
+
 			if(me.allowCut) // FIXME allowCut incompatible with align != 0
-				draw_Text(me.realOrigin, draw_TextShortenToWidth(t, (1 - me.keepspaceLeft - me.keepspaceRight), me.allowColors, me.realFontSize), me.realFontSize, me.colorL, me.alpha, me.allowColors);
+				draw_Text(me.realOrigin, draw_TextShortenToWidth(t, (1 - me.keepspaceLeft - me.keepspaceRight), me.allowColors, fs), fs, me.colorL, me.alpha, me.allowColors);
 			else if(me.allowWrap) // FIXME allowWrap incompatible with align != 0
 			{
 				getWrappedLine_remaining = t;
@@ -81,15 +157,17 @@ void Label_draw(entity me)
 				while(getWrappedLine_remaining)
 				{
 					if (me.allowColors)
-						t = getWrappedLine((1 - me.keepspaceLeft - me.keepspaceRight), me.realFontSize, draw_TextWidth_WithColors);
+						t = getWrappedLine((1 - me.keepspaceLeft - me.keepspaceRight), fs, draw_TextWidth_WithColors);
 					else
-						t = getWrappedLine((1 - me.keepspaceLeft - me.keepspaceRight), me.realFontSize, draw_TextWidth_WithoutColors);
-					draw_Text(o, t, me.realFontSize, me.colorL, me.alpha, me.allowColors);
+						t = getWrappedLine((1 - me.keepspaceLeft - me.keepspaceRight), fs, draw_TextWidth_WithoutColors);
+					draw_Text(o, t, fs, me.colorL, me.alpha, me.allowColors);
 					o_y += me.realFontSize_y;
 				}
 			}
 			else
-				draw_Text(me.realOrigin, t, me.realFontSize, me.colorL, me.alpha, me.allowColors);
+				draw_Text(me.realOrigin, t, fs, me.colorL, me.alpha, me.allowColors);
+
+			draw_fontscale = dfs;
 		}
 }
 #endif