From 2369ecc1188fc786597916a7cbf5ce681a97129f Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Wed, 6 Jan 2010 16:26:01 -0800 Subject: EXT-3824 [BSI] Rename Inventory Item Text Cutoff EXT-3757 Text Placement is Too High when Editing Landmark/Outfit/Notecard Names reviewed by Richard --- indra/llui/lllineeditor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llui/lllineeditor.cpp') diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 8a21155cc3..a180445b0b 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1583,7 +1583,6 @@ void LLLineEditor::draw() F32 alpha = getDrawContext().mAlpha; S32 text_len = mText.length(); static LLUICachedControl lineeditor_cursor_thickness ("UILineEditorCursorThickness", 0); - static LLUICachedControl lineeditor_v_pad ("UILineEditorVPad", 0); static LLUICachedControl preedit_marker_brightness ("UIPreeditMarkerBrightness", 0); static LLUICachedControl preedit_marker_gap ("UIPreeditMarkerGap", 0); static LLUICachedControl preedit_marker_position ("UIPreeditMarkerPosition", 0); @@ -1609,6 +1608,8 @@ void LLLineEditor::draw() LLRect background( 0, getRect().getHeight(), getRect().getWidth(), 0 ); background.stretch( -mBorderThickness ); + S32 lineeditor_v_pad = llceil((background.getHeight() - mGLFont->getLineHeight())/2); + drawBackground(); // draw text -- cgit v1.2.3 From 95f14d73138a4f0eb9163fdc560a0dcad9564c4c Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Wed, 6 Jan 2010 16:37:06 -0800 Subject: changing lineeditor text positioning center logic from using llceil to llround --- indra/llui/lllineeditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llui/lllineeditor.cpp') diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index a180445b0b..73e4d126f3 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1608,7 +1608,7 @@ void LLLineEditor::draw() LLRect background( 0, getRect().getHeight(), getRect().getWidth(), 0 ); background.stretch( -mBorderThickness ); - S32 lineeditor_v_pad = llceil((background.getHeight() - mGLFont->getLineHeight())/2); + S32 lineeditor_v_pad = llround((background.getHeight() - mGLFont->getLineHeight())/2); drawBackground(); -- cgit v1.2.3