Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[-] Fixed crash when using tabs in text

Browse source
This commit is contained in:
cybermind 2014-05-25 13:47:53 +06:00
parent e4c357c1d9
commit 57391a45cf
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/video/font.cpp
View file

@ -490,6 +490,8 @@ int CLabel::DoDrawText(int x, int y,
{
int widths = 0;
int utf8;
bool tab;
const int tabSize = 4; // FIXME: will be removed when text system will be rewritten
size_t pos = 0;
const CFontColor *backup = fc;
bool isReverse = false;
@ -497,7 +499,10 @@ int CLabel::DoDrawText(int x, int y,
CGraphic *g = font->GetFontColorGraphic(*FontColor);
while (GetUTF8(text, len, pos, utf8)) {
if (utf8 == '~') {
tab = false;
if (utf8 == '\t') {
tab = true;
} else if (utf8 == '~') {
switch (text[pos]) {
case '\0': // wrong formatted string.
DebugPrint("oops, format your ~\n");
@ -553,7 +558,13 @@ int CLabel::DoDrawText(int x, int y,
}
}
}
widths += font->DrawChar<CLIP>(*g, utf8, x + widths, y, *fc);
if (tab) {
for (int tabs = 0; tabs < tabSize; ++tabs) {
widths += font->DrawChar<CLIP>(*g, ' ', x + widths, y, *fc);
}
} else {
widths += font->DrawChar<CLIP>(*g, utf8, x + widths, y, *fc);
}
if (isReverse == false && fc != backup) {
fc = backup;