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

[-] Fixed colored text

Browse source
This commit is contained in:
cybermind 2014-09-24 22:15:59 +06:00
parent 49c60110f9
commit aff4a094bc
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/video/font.cpp
View file

@ -494,7 +494,7 @@ int CLabel::DoDrawText(int x, int y,
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;
bool isColor = false;
font->DynamicLoad();
CGraphic *g = font->GetFontColorGraphic(*FontColor);
@ -520,7 +520,7 @@ int CLabel::DoDrawText(int x, int y,
case '<':
LastTextColor = fc;
if (fc != reverse) {
isReverse = true;
isColor = true;
fc = reverse;
g = font->GetFontColorGraphic(*fc);
}
@ -529,7 +529,7 @@ int CLabel::DoDrawText(int x, int y,
case '>':
if (fc != LastTextColor) {
std::swap(fc, LastTextColor);
isReverse = false;
isColor = false;
g = font->GetFontColorGraphic(*fc);
}
++pos;
@ -551,6 +551,7 @@ int CLabel::DoDrawText(int x, int y,
LastTextColor = fc;
const CFontColor *fc_tmp = CFontColor::Get(color);
if (fc_tmp) {
isColor = true;
fc = fc_tmp;
g = font->GetFontColorGraphic(*fc);
}
@ -566,7 +567,7 @@ int CLabel::DoDrawText(int x, int y,
widths += font->DrawChar<CLIP>(*g, utf8, x + widths, y, *fc);
}
if (isReverse == false && fc != backup) {
if (isColor == false && fc != backup) {
fc = backup;
g = font->GetFontColorGraphic(*fc);
}