diff options
author | Kitty Barnett <develop@catznip.com> | 2012-05-15 13:13:44 +0200 |
---|---|---|
committer | Kitty Barnett <develop@catznip.com> | 2012-05-15 13:13:44 +0200 |
commit | 34e7226ac88e14d4cfed6bc0d63da215afe0ac88 (patch) | |
tree | b4b9b1f8a3f2d4c63018f94a194d2471e9f99e9c /indra/llrender/llfontgl.cpp | |
parent | 4e24e43e1643a24a090f7b61b38c03df34937579 (diff) |
STORM-276 FIXED Squiggles overflow line editor height when font size is set to large
- Also reduced squiggle width from 6 to 4 and prevented running past the end of a word
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
-rw-r--r-- | indra/llrender/llfontgl.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index fccbf37a8d..4dc2fcd714 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -422,6 +422,16 @@ S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, S32 x, S32 y } // font metrics - override for LLFontFreetype that returns units of virtual pixels +F32 LLFontGL::getAscenderHeight() const +{ + return mFontFreetype->getAscenderHeight() / sScaleY; +} + +F32 LLFontGL::getDescenderHeight() const +{ + return mFontFreetype->getDescenderHeight() / sScaleY; +} + S32 LLFontGL::getLineHeight() const { return llceil(mFontFreetype->getAscenderHeight() / sScaleY) + llceil(mFontFreetype->getDescenderHeight() / sScaleY); |