Ancurio/mkxp-freebird
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Font: Open TTF font as late as possible

Browse source 
This reduces opened fonts that were never going
to be used anyway.
This commit is contained in:
Jonas Kulla 2014-01-04 13:47:00 +01:00
parent 857693d4a1
commit d93c1280aa
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/font.cpp
View file

@ -146,6 +146,9 @@ struct FontPrivate
static Color defaultColorTmp;
/* The actual font is opened as late as possible
* (when it is queried by a Bitmap), prior it is
* set to null */
TTF_Font *sdlFont;
FontPrivate(const char *name = 0,
@ -155,11 +158,9 @@ struct FontPrivate
bold(defaultBold),
italic(defaultItalic),
color(&colorTmp),
colorTmp(*defaultColor)
{
sdlFont = shState->fontPool().request(this->name.c_str(),
this->size);
}
colorTmp(*defaultColor),
sdlFont(0)
{}
FontPrivate(const FontPrivate &other)
: name(other.name),
@ -214,7 +215,7 @@ void Font::setName(const char *value)
return;
p->name = value;
p->sdlFont = shState->fontPool().request(value, p->size);
p->sdlFont = 0;
}
void Font::setSize(int value)
@ -223,7 +224,7 @@ void Font::setSize(int value)
return;
p->size = value;
p->sdlFont = shState->fontPool().request(p->name.c_str(), value);
p->sdlFont = 0;
}
#undef CHK_DISP
@ -251,6 +252,10 @@ void Font::setDefaultName(const char *value)
_TTF_Font *Font::getSdlFont()
{
if (!p->sdlFont)
p->sdlFont = shState->fontPool().request(p->name.c_str(),
p->size);
int style = TTF_STYLE_NORMAL;
if (p->bold)