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

SL-19815 Suppors Page Up, Page Down, Home, End and Delete

master
Andrey Kleshchev 2023-06-02 22:48:57 +03:00
parent 07fc011e20
commit 8a33d65e98
3 changed files with 109 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
indra/newview/llinventorygallery.cpp
View File

@ -858,6 +858,109 @@ BOOL LLInventoryGallery::handleRightMouseDown(S32 x, S32 y, MASK mask)
return res;
}
BOOL LLInventoryGallery::handleKeyHere(KEY key, MASK mask)
{
BOOL handled = FALSE;
switch (key)
{
case KEY_RETURN:
// Open selected items if enter key hit on the inventory panel
if (mask == MASK_NONE && mInventoryGalleryMenu && mSelectedItemID.notNull())
{
LLViewerInventoryCategory* category = gInventory.getCategory(mSelectedItemID);
if (category)
{
setRootFolder(mSelectedItemID);
handled = TRUE;
}
}
break;
case KEY_DELETE:
#if LL_DARWIN
case KEY_BACKSPACE:
#endif
// 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 (mSelectedItemID.notNull())
{
LLViewerInventoryCategory* category = gInventory.getCategory(mSelectedItemID);
if (category)
{
if (get_is_category_removable(&gInventory, mSelectedItemID))
{
gInventory.removeCategory(mSelectedItemID);
handled = TRUE;
}
}
else
{
if (get_is_item_removable(&gInventory, mSelectedItemID))
{
gInventory.removeItem(mSelectedItemID);
handled = TRUE;
}
}
}
break;
case KEY_F2:
mFilterSubString.clear();
if (mInventoryGalleryMenu && mSelectedItemID.notNull())
{
mInventoryGalleryMenu->doToSelected("rename", mSelectedItemID);
}
handled = TRUE;
break;
case KEY_PAGE_UP:
mFilterSubString.clear();
if (mScrollPanel)
{
mScrollPanel->pageUp(30);
}
handled = TRUE;
break;
case KEY_PAGE_DOWN:
mFilterSubString.clear();
if (mScrollPanel)
{
mScrollPanel->pageDown(30);
}
handled = TRUE;
break;
case KEY_HOME:
mFilterSubString.clear();
if (mScrollPanel)
{
mScrollPanel->goToTop();
}
handled = TRUE;
break;
case KEY_END:
mFilterSubString.clear();
if (mScrollPanel)
{
mScrollPanel->goToBottom();
}
handled = TRUE;
break;
default:
break;
}
if (handled)
{
mInventoryGalleryMenu->hide();
}
return handled;
}
void LLInventoryGallery::showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id)
{
if (mInventoryGalleryMenu && item_id.notNull())

9
indra/newview/llinventorygallery.h
View File

@ -73,12 +73,13 @@ public:
LLInventoryGallery(const LLInventoryGallery::Params& params = getDefaultParams());
~LLInventoryGallery();
BOOL postBuild();
BOOL postBuild() override;
void initGallery();
void draw();
void draw() override;
BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type,
void* cargo_data, EAcceptance* accept, std::string& tooltip_msg);
BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
void* cargo_data, EAcceptance* accept, std::string& tooltip_msg) override;
BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
BOOL handleKeyHere(KEY key, MASK mask) override;
void setFilterSubString(const std::string& string);
std::string getFilterSubString() { return mFilterSubString; }

2
indra/newview/llinventorygallerymenu.h
View File

@ -39,12 +39,12 @@ public:
bool isRootFolder() { return mRootFolder; }
void setRootFolder(bool is_root) { mRootFolder = is_root; }
void doToSelected(const LLSD& userdata, const LLUUID& selected_id);
protected:
//virtual void buildContextMenu(class LLMenuGL& menu, U32 flags);
void updateMenuItemsVisibility(LLContextMenu* menu);
void doToSelected(const LLSD& userdata, const LLUUID& selected_id);
void fileUploadLocation(const LLSD& userdata, const LLUUID& selected_id);
static void onRename(const LLSD& notification, const LLSD& response);