From 4cbf65be95dfb2320642c018b15a904075283339 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 9 Jul 2009 22:02:14 +0000
Subject: [PATCH] DEV-35127 Text placement in an input box is uncomfortably
low. Changed UILineEditorVPad default, pushed up the bottom of selection
highlight by 1 pixel. Initialized a couple of variables in constructor.
Trivial, not reviewed.
---
indra/llui/lllineeditor.cpp | 5 ++++-
indra/newview/app_settings/settings.xml | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index f3afadca159..d7c0cf4f7b2 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -124,6 +124,8 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
mScrollHPos( 0 ),
mTextPadLeft(p.text_pad_left),
mTextPadRight(p.text_pad_right),
+ mMinHPixels(0), // computed in updateTextPadding() below
+ mMaxHPixels(0), // computed in updateTextPadding() below
mCommitOnFocusLost( p.commit_on_focus_lost ),
mRevertOnEsc( TRUE ),
mKeystrokeCallback( p.keystroke_callback() ),
@@ -1554,7 +1556,8 @@ void LLLineEditor::draw()
// draw text
- S32 cursor_bottom = background.mBottom + 1;
+ // With viewer-2 art files, input region is 2 pixels up
+ S32 cursor_bottom = background.mBottom + 2;
S32 cursor_top = background.mTop - 1;
LLColor4 text_color;
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e53b50c216d..d328a3856f1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8036,7 +8036,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>3</integer>
</map>
<key>UIMaxComboWidth</key>
<map>
--
GitLab