diff options
| author | callum <none@none> | 2012-01-27 13:18:56 -0800 |
|---|---|---|
| committer | callum <none@none> | 2012-01-27 13:18:56 -0800 |
| commit | f53a72ec2c40ae04cee6dee2f58d76c5fedeca99 (patch) | |
| tree | e09f6db35a7c2f70fd8cdc45e105aec0f4bea9e0 /indra/llrender/llfontgl.cpp | |
| parent | 987463d9248d7fab9534ff7a9f303c6db42da7a9 (diff) | |
| parent | 13d510d5f2fa2d9bf654e70d9191f1909b1f299e (diff) | |
Merge with head
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 12f86cf599..a469581637 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -215,16 +215,17 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons cur_y = ((F32)y * sScaleY) + origin.mV[VY]; // Offset y by vertical alignment. + // use unscaled font metrics here switch (valign) { case TOP: - cur_y -= getAscenderHeight(); + cur_y -= mFontFreetype->getAscenderHeight(); break; case BOTTOM: - cur_y += getDescenderHeight(); + cur_y += mFontFreetype->getDescenderHeight(); break; case VCENTER: - cur_y -= (getAscenderHeight() - getDescenderHeight()) / 2.f; + cur_y -= (mFontFreetype->getAscenderHeight() - mFontFreetype->getDescenderHeight()) / 2.f; break; case BASELINE: // Baseline, do nothing. |