Skip to content

Add missing parameter to TextWidth usage in string_width. #700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add missing parameter to TextWidth usage in string_width. #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/functions/Function_Font.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ function string_height(_text) {
// #############################################################################################
function string_width(_text) {
g_pFontManager.SetFont();
return g_pFontManager.thefont ? g_pFontManager.thefont.TextWidth(yyGetString(_text)) : 1;
return g_pFontManager.thefont ? g_pFontManager.thefont.TextWidth(yyGetString(_text), undefined, 0) : 1;
}


Expand Down
6 changes: 3 additions & 3 deletions scripts/yyFont.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ yyFont.prototype.Draw_String_GL = function (_x, _y, _pStr, _xscale, _yscale, _an

var bLerp=false;
if ( (_col1 != _col2) || (_col3 != _col4) ) {
var strWidth = this.TextWidth(_pStr, true,0);
var strWidth = this.TextWidth(_pStr, true, 0);
var invStrWidth = 1/strWidth;
var alpha = _col1 & 0xff000000;
bLerp = true;
Expand Down Expand Up @@ -2488,8 +2488,8 @@ yyFontManager.prototype.GR_Text_Draw = function (_str, x, y, linesep, linewidth,

if (pStr != null)
{
if (this.halign == 1) xoff = -(xscale * thefont.TextWidth(pStr, true,0) / 2);
if (this.halign == 2) xoff = -(xscale * thefont.TextWidth(pStr, true,0));
if (this.halign == 1) xoff = -(xscale * thefont.TextWidth(pStr, true, 0) / 2);
if (this.halign == 2) xoff = -(xscale * thefont.TextWidth(pStr, true, 0));

var xx = passx + (cc * xoff) + (ss * yoff);
var yy = passy - (ss * xoff) + (cc * yoff);
Expand Down