From 60c66fe5a40917fec0e2059704f1540713d58253 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 24 Jun 2010 10:04:33 +0200 Subject: [PATCH] now PROPERLY apply draw_fontscale in TextWidth --- qcsrc/menu/draw.qc | 10 ++++------ qcsrc/menu/item/label.c | 3 +++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/qcsrc/menu/draw.qc b/qcsrc/menu/draw.qc index 9e722cb12a..cec73d6c0a 100644 --- a/qcsrc/menu/draw.qc +++ b/qcsrc/menu/draw.qc @@ -233,11 +233,9 @@ void draw_Text(vector theOrigin, string theText, vector theSize, vector theColor if(theSize_x <= 0 || theSize_y <= 0) error("Drawing zero size text?\n"); - /* - float wi; - wi = draw_TextWidth(theText, ICanHasKallerz, theSize); - draw_Fill(theOrigin, '1 0 0' * wi + '0 1 0' * theSize_y, '1 0 0', 0.3); - */ + //float wi; + //wi = draw_TextWidth(theText, ICanHasKallerz, theSize); + //draw_Fill(theOrigin, '1 0 0' * wi + '0 1 0' * theSize_y, '1 0 0', 0.3); if(ICanHasKallerz) drawcolorcodedstring(boxToGlobal(theOrigin, draw_shift, draw_scale), theText, globalToBoxSize(boxToGlobalSize(theSize, draw_scale), draw_fontscale), theAlpha * draw_alpha, 0); @@ -257,7 +255,7 @@ float draw_TextWidth(string theText, float ICanHasKallerz, vector SizeThxBye) vector v; v = '0 0 0'; //float r; - v_x = stringwidth(theText, ICanHasKallerz, boxToGlobalSize(SizeThxBye, draw_scale)); + v_x = stringwidth(theText, ICanHasKallerz, globalToBoxSize(boxToGlobalSize(SizeThxBye, draw_scale), draw_fontscale)); v = globalToBoxSize(v, draw_scale); return v_x; } diff --git a/qcsrc/menu/item/label.c b/qcsrc/menu/item/label.c index 67db22a1b4..7ed6e4f68e 100644 --- a/qcsrc/menu/item/label.c +++ b/qcsrc/menu/item/label.c @@ -74,6 +74,9 @@ void Label_draw(entity me) if(me.recalcPos) me.realOrigin_x = me.align * (1 - me.keepspaceLeft - me.keepspaceRight - min(draw_TextWidth(t, me.allowColors, me.realFontSize), (1 - me.keepspaceLeft - me.keepspaceRight))) + me.keepspaceLeft; me.recalcPos = 0; + + //if(me.text == "Bookmark") + // draw_Fill(me.realOrigin, '0 1 0' + '1 0 0' * draw_TextWidth(t, me.allowColors, me.realFontSize), '1 0 1', 1); if(me.fontSize) if(t) -- 2.39.2