diff options
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_textbox.xml | 17 |
2 files changed, 7 insertions, 17 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. diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml index 3d1bc0edae..1d31fbd6dc 100644 --- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml @@ -8,18 +8,7 @@ help_topic="floater_test_textbox" translate="false" width="800"> - <text - type="string" - length="1" - height="90" - layout="topleft" - left="10" - valign="bottom" - clip="true" - top_pad="30" - width="300"> -___</text> - <!--<text + <text clip_partial="true" top_pad="10" left="10" @@ -150,7 +139,7 @@ ___</text> The 华文细黑 brown fox ヒラキjumped over the lazy dog. </text> ---><!-- next column --><!-- +<!-- next column --> <text_editor height="50" follows="top|left|bottom" @@ -247,5 +236,5 @@ with multiple lines and too many lines to actually fit - </text>--> + </text> </floater> |