From b183b6f1413f2f534633f021480ccc4570235f2d Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 6 Sep 2011 14:45:11 -0700 Subject: EXP-1196 FIX Fix param block template ordering changed ordering of template loading relative to constructor setting of params moved a lot of constructor-set params to template files reviewed by Leslie --- 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 06fbc0f234..c2173fb89c 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -103,7 +103,7 @@ LLLineEditor::Params::Params() text_pad_right("text_pad_right"), default_text("default_text") { - mouse_opaque = true; + changeDefault(mouse_opaque, true); addSynonym(select_on_focus, "select_all_on_focus_received"); addSynonym(border, "border"); addSynonym(label, "watermark_text"); -- cgit v1.2.3 From f2acd554bcf8326824acc23457a38a70021b0026 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Thu, 8 Sep 2011 16:34:54 -0700 Subject: Clean up erroneous XUI parsing errors. --- indra/llui/lllineeditor.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llui/lllineeditor.cpp') diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index c2173fb89c..ebdd47ae80 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -107,6 +107,7 @@ LLLineEditor::Params::Params() addSynonym(select_on_focus, "select_all_on_focus_received"); addSynonym(border, "border"); addSynonym(label, "watermark_text"); + addSynonym(max_length.chars, "max_length"); } LLLineEditor::LLLineEditor(const LLLineEditor::Params& p) -- cgit v1.2.3 From 8b7f4d4ea38175ad1ee6cd0fe7d478d1802876c1 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Fri, 16 Sep 2011 19:09:37 +0300 Subject: STORM-1600 FIXED Folder view stole "Delete" key presses from the line editor when renaming a newly created inventory item. Reason: LLFocusMgr::setKeyboardFocus() which is called from LLLineEditor::setFocus() makes the folder view the edit menu handler, thus it receives the Delete key presses instead of the line editor. Fix: Make sure the line editor becomes the edit menu handler whenever it's focused, no matter is it a child of a folder view or not. --- indra/llui/lllineeditor.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llui/lllineeditor.cpp') diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index ebdd47ae80..06dfc90d83 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -198,6 +198,7 @@ LLLineEditor::~LLLineEditor() void LLLineEditor::onFocusReceived() { + gEditMenuHandler = this; LLUICtrl::onFocusReceived(); updateAllowingLanguageInput(); } -- cgit v1.2.3