diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-08-03 11:57:51 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-08-03 11:57:51 -0400 |
| commit | fdb2ae8335f136283910f9538e74724b69886e15 (patch) | |
| tree | 79ed0377590b5d291a301d3ae138145d4cb4608e /indra/llrender/llfontgl.cpp | |
| parent | 1d5490e752deeff316658f4850aac5fc96a91866 (diff) | |
| parent | b8bac66a0f8c392a221ad2c64611e2a55de82339 (diff) | |
Merge of viewer-development (3.4.1).
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); |