Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak removeWord code to make it work for text editors and make more sense

Browse Source
This commit is contained in:
Inusaito Sayori
2015-07-17 22:07:35 -04:00
parent 3d1d138074
commit 0b70603a0c
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/llui/lltexteditor.cpp
View File

@@ -1817,10 +1817,10 @@ void LLTextEditor::removeChar()
// Remove a word (set of characters up to next space/punctuation) from the text
void LLTextEditor::removeWord(bool prev)
{
const U32 pos(mCursorPos);
if (prev ? pos > 0 : static_cast<S32>(pos) < getLength())
const S32& pos(mCursorPos);
if (prev ? pos > 0 : pos < getLength())
{
U32 new_pos(prev ? prevWordPos(pos) : nextWordPos(pos));
S32 new_pos(prev ? prevWordPos(pos) : nextWordPos(pos));
if (new_pos == pos) // Other character we don't jump over
new_pos = prev ? prevWordPos(new_pos-1) : nextWordPos(new_pos+1);
@@ -2368,6 +2368,13 @@ BOOL LLTextEditor::handleControlKey(const KEY key, const MASK mask)
}
break;
case KEY_DELETE:
if (getEnabled())
removeWord(false);
else
handled = false;
break;
default:
handled = FALSE;
break;
@@ -2485,17 +2492,6 @@ BOOL LLTextEditor::handleSpecialKey(const KEY key, const MASK mask, BOOL* return
}
break;
case KEY_DELETE:
if (getEnabled() && mask == MASK_CONTROL)
{
removeWord(false);
}
else
{
handled = false;
}
break;
case KEY_RETURN:
if (mask == MASK_NONE)
{