livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-735 : Fixed! Handle the backspace case, suppress the search string handling from LLFolderView (it's in the search edit field now).

meow-7.2.2
Merov Linden 2013-02-07 13:27:32 -08:00
parent 560aba3aa4
commit dac026a7d6
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llui/llfolderview.cpp
View File

@ -1275,20 +1275,6 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask )
break;
}
if (!handled && mParentPanel->hasFocus())
{
if (key == KEY_BACKSPACE)
{
mSearchTimer.reset();
if (mSearchString.size())
{
mSearchString.erase(mSearchString.size() - 1, 1);
}
search(getCurSelectedItem(), mSearchString, FALSE);
handled = TRUE;
}
}
return handled;
}

3
indra/newview/llinventorypanel.cpp
View File

@ -1367,6 +1367,9 @@ BOOL LLInventoryPanel::handleKeyHere( KEY key, MASK mask )
}
break;
case KEY_DELETE:
case KEY_BACKSPACE:
// Delete selected items if delete or backspace key hit on the inventory panel
// Note: on Mac laptop keyboards, backspace and delete are one and the same
if (mask == MASK_NONE)
{
LLInventoryAction::doToSelected(mInventory, mFolderRoot, "delete");