Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5434 from Dhilan007/develop_label 

closed #3758:fixed character will not aligned on the the baseline when label using distance field.
This commit is contained in:
James Chen 2014-02-21 18:29:47 +08:00
parent 7493f6aeea 821c8a73bc
commit e9c1335084
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cocos/2d/CCFontFreeType.cpp
View File

@ -156,8 +156,17 @@ bool FontFreeType::getBBOXFotChar(unsigned short theChar, Rect &outRect, int &xA
return false; return false;
// load glyph infos // load glyph infos
if (FT_Load_Glyph(_fontRef, glyph_index, FT_LOAD_DEFAULT)) if (_distanceFieldEnabled)
return false; {
if (FT_Load_Glyph(_fontRef, glyph_index, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING | FT_LOAD_NO_AUTOHINT))
return false;
}
else
{
if (FT_Load_Glyph(_fontRef, glyph_index, FT_LOAD_DEFAULT))
return false;
}
// store result in the passed rectangle // store result in the passed rectangle
outRect.origin.x = _fontRef->glyph->metrics.horiBearingX >> 6; outRect.origin.x = _fontRef->glyph->metrics.horiBearingX >> 6;
@ -236,7 +245,7 @@ unsigned char * FontFreeType::getGlyphBitmap(unsigned short theChar, int &outWid
return 0; return 0;
if (_distanceFieldEnabled) if (_distanceFieldEnabled)
{ {
if (FT_Load_Char(_fontRef,theChar,FT_LOAD_RENDER | FT_LOAD_NO_HINTING | FT_LOAD_NO_AUTOHINT)) if (FT_Load_Char(_fontRef,theChar,FT_LOAD_RENDER | FT_LOAD_NO_HINTING | FT_LOAD_NO_AUTOHINT))
return 0; return 0;
} }