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

CHUI-735 : Fixed! Move the delete key handling from the llfolderview to the llinventorypanel level.

meow-7.2.2
Merov Linden 2013-02-06 18:11:52 -08:00
parent 418b0334f2
commit 7ed270ff9d
3 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/llui/llfolderview.cpp
View File

@ -1336,29 +1336,6 @@ BOOL LLFolderView::handleUnicodeCharHere(llwchar uni_char)
}
BOOL LLFolderView::canDoDelete() const
{
if (mSelectedItems.size() == 0) return FALSE;
for (selected_items_t::const_iterator item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
{
if (!(*item_it)->getViewModelItem()->isItemRemovable())
{
return FALSE;
}
}
return TRUE;
}
void LLFolderView::doDelete()
{
if(mSelectedItems.size() > 0)
{
removeSelectedItems();
}
}
BOOL LLFolderView::handleMouseDown( S32 x, S32 y, MASK mask )
{
mKeyboardSelection = FALSE;

3
indra/llui/llfolderview.h
View File

@ -180,9 +180,6 @@ public:
virtual BOOL canPaste() const;
virtual void paste();
virtual BOOL canDoDelete() const;
virtual void doDelete();
LLFolderViewItem* getNextUnselectedItem();
// Public rename functionality - can only start the process

8
indra/newview/llinventorypanel.cpp
View File

@ -1365,6 +1365,14 @@ BOOL LLInventoryPanel::handleKeyHere( KEY key, MASK mask )
LLInventoryAction::doToSelected(mInventory, mFolderRoot, "open");
handled = TRUE;
}
break;
case KEY_DELETE:
if (mask == MASK_NONE)
{
LLInventoryAction::doToSelected(mInventory, mFolderRoot, "delete");
handled = TRUE;
}
break;
}
return handled;
}