Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed left offset parameter handling for center/right align string drawing. A brief note about string drawing, offset and display width is added in the WFont.h

Browse Source
This commit is contained in:
linshier
2010-12-01 08:01:13 +00:00
parent a0427d99df
commit aa6aa20ba5
3 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
projects/mtg/src/WFont.cpp
View File

@@ -386,10 +386,20 @@ void WFBFont::DrawString(const char *s, float x, float y, int align, float leftO
switch (align)
{
case JGETEXT_RIGHT:
x -= GetStringWidth(s);
if (width) {
x -= width;
leftOffset += GetStringWidth(s) - width;
}
else
x -= GetStringWidth(s);
break;
case JGETEXT_CENTER:
x -= GetStringWidth(s) / 2;
if (width) {
x -= width/2;
leftOffset += GetStringWidth(s)/2 - width/2;
}
else
x -= GetStringWidth(s)/2;
break;
case JGETEXT_LEFT:
default:
@@ -473,7 +483,7 @@ void WFBFont::DrawString(const char *s, float x, float y, int align, float leftO
charW = delta / mScale;
}
}
else if (width)
if (width)
{
if (xx > x + width) return;
if (xx + delta > x + width)
@@ -778,10 +788,20 @@ void WGBKFont::DrawString(const char *s, float x, float y, int align, float left
switch (align)
{
case JGETEXT_RIGHT:
x -= GetStringWidth(s);
if (width) {
x -= width;
leftOffset += GetStringWidth(s) - width;
}
else
x -= GetStringWidth(s);
break;
case JGETEXT_CENTER:
x -= GetStringWidth(s) / 2;
if (width) {
x -= width/2;
leftOffset += GetStringWidth(s)/2 - width/2;
}
else
x -= GetStringWidth(s)/2;
break;
case JGETEXT_LEFT:
default:
@@ -882,7 +902,7 @@ void WGBKFont::DrawString(const char *s, float x, float y, int align, float left
charW = delta / mScale;
}
}
else if (width)
if (width)
{
if (xx > x + width) return;
if (xx + delta > x + width)