Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / languagelist.c

diff --git a/qcsrc/menu/xonotic/languagelist.c b/qcsrc/menu/xonotic/languagelist.c
index 56d074115a4c6a788ba49d83e558739c86244cb3..24445786aea98b696c0c1c84b926d6ac29cafc2c 100644 (file)
--- a/qcsrc/menu/xonotic/languagelist.c
+++ b/qcsrc/menu/xonotic/languagelist.c
@@ -64,14 +64,25 @@ void XonoticLanguageList_drawListBoxItem(entity me, float i, vector absSize, flo
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
 
        s = me.languageParameter(me, i, LANGPARM_NAME_LOCALIZED);
-       s = draw_TextShortenToWidth(s, me.columnNameSize, 0, me.realFontSize);
-       draw_Text(me.realUpperMargin * eY + me.columnNameOrigin * eX, s, me.realFontSize, SKINCOLOR_TEXT, SKINALPHA_TEXT, 0);
+
+       vector save_fontscale = draw_fontscale;
+       float f = draw_CondensedFontFactor(s, FALSE, me.realFontSize, 1);
+       draw_fontscale_x *= f;
+       vector fs = me.realFontSize;
+       fs_x *= f;
+       draw_Text(me.realUpperMargin * eY + me.columnNameOrigin * eX, s, fs, SKINCOLOR_TEXT, SKINALPHA_TEXT, 0);
+       draw_fontscale = save_fontscale;
 
        p = me.languageParameter(me, i, LANGPARM_PERCENTAGE);
        if(p != "")
        {
-               p = draw_TextShortenToWidth(p, me.columnPercentageSize, 0, me.realFontSize);
-               draw_Text(me.realUpperMargin * eY + (me.columnPercentageOrigin + (me.columnPercentageSize - draw_TextWidth(p, 0, me.realFontSize))) * eX, p, me.realFontSize, SKINCOLOR_TEXT, SKINALPHA_TEXT, 0);
+               vector save_fontscale = draw_fontscale;
+               float f = draw_CondensedFontFactor(p, FALSE, me.realFontSize, 1);
+               draw_fontscale_x *= f;
+               vector fs = me.realFontSize;
+               fs_x *= f;
+               draw_Text(me.realUpperMargin * eY + (me.columnPercentageOrigin + (me.columnPercentageSize - draw_TextWidth(p, 0, fs))) * eX, p, fs, SKINCOLOR_TEXT, SKINALPHA_TEXT, 0);
+               draw_fontscale = save_fontscale;
        }
 }