diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-11 00:00:10 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-11 00:00:10 +0000 |
| commit | 6e1a8d894d836e23c5eeb783636c21a992730727 (patch) | |
| tree | a5c08912efcad669a41c9b8d30f065d101e1810a /indra/newview/llsearchcombobox.cpp | |
| parent | 9cd1efca176ebf9e2f5d5d5c1dae90d8ee017dad (diff) | |
svn merge svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1614 https://svn.aws.productengine.com/secondlife/pe/stable-2@1618 -> viewer-2.0.0-3
* EXT-895
Diffstat (limited to 'indra/newview/llsearchcombobox.cpp')
| -rw-r--r-- | indra/newview/llsearchcombobox.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/llsearchcombobox.cpp b/indra/newview/llsearchcombobox.cpp index ab5536a12d..33efae50ae 100644 --- a/indra/newview/llsearchcombobox.cpp +++ b/indra/newview/llsearchcombobox.cpp @@ -187,6 +187,23 @@ void LLSearchComboBox::clearHistory() setTextEntry(LLStringUtil::null); } +BOOL LLSearchComboBox::handleKeyHere(KEY key,MASK mask ) +{ + if(mTextEntry->hasFocus() && MASK_NONE == mask && KEY_DOWN == key) + { + S32 first = 0; + S32 size = 0; + + // get entered text (without auto-complete part) + mTextEntry->getSelectionRange(&first, &size); + std::string search_query = mTextEntry->getText(); + search_query.erase(first, size); + + onSearchPrearrange(search_query); + } + return LLComboBox::handleKeyHere(key, mask); +} + LLSearchHistoryBuilder::LLSearchHistoryBuilder(LLSearchComboBox* combo_box, const std::string& filter) : mComboBox(combo_box) , mFilter(filter) |