Hopefully fixed Font baseline calculation.

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-05-19 19:14:58 -03:00
parent 7694edfd52
commit 0b3b58adb8
+5 -3
View File
@@ -914,9 +914,11 @@ int Font::getDescent() const
float Font::getBaseline() const float Font::getBaseline() const
{ {
// 1.25 is magic line height for true type fonts float ascent = getAscent();
if (rasterizers[0]->getDataType() == font::Rasterizer::DATA_TRUETYPE) if (ascent != 0.0f)
return floorf(getHeight() / 1.25f + 0.5f); return ascent;
else if (rasterizers[0]->getDataType() == font::Rasterizer::DATA_TRUETYPE)
return floorf(getHeight() / 1.25f + 0.5f); // 1.25 is magic line height for true type fonts
else else
return 0.0f; return 0.0f;
} }