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

Add CTRL-F accelerator key support

master
Ansariel 2021-05-10 12:39:56 +02:00
parent 834f8d48b7
commit 376fe00f8f
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/fsfloatercontacts.cpp
View File

@ -199,10 +199,18 @@ BOOL FSFloaterContacts::tick()
BOOL FSFloaterContacts::handleKeyHere(KEY key, MASK mask)
{
if (FSCommon::isFilterEditorKeyCombo(key, mask) && getActiveTabName() == FRIENDS_TAB_NAME && gSavedSettings.getBOOL("FSContactListShowSearch"))
if (FSCommon::isFilterEditorKeyCombo(key, mask))
{
mFriendFilter->setFocus(TRUE);
return TRUE;
if (getActiveTabName() == FRIENDS_TAB_NAME && gSavedSettings.getBOOL("FSContactListShowSearch"))
{
mFriendFilter->setFocus(TRUE);
return TRUE;
}
else if (getActiveTabName() == GROUP_TAB_NAME)
{
mGroupFilter->setFocus(TRUE);
return true;
}
}
if (mask == MASK_CONTROL && key == 'W' && getHost())

12
indra/newview/fsfloatergrouptitles.cpp
View File

@ -27,6 +27,7 @@
#include "llviewerprecompiledheaders.h"
#include "fsfloatergrouptitles.h"
#include "fscommon.h"
#include "llfiltereditor.h"
#include "llgroupactions.h"
#include "llscrolllistctrl.h"
@ -105,6 +106,17 @@ BOOL FSFloaterGroupTitles::postBuild()
return TRUE;
}
BOOL FSFloaterGroupTitles::handleKeyHere(KEY key, MASK mask)
{
if (FSCommon::isFilterEditorKeyCombo(key, mask))
{
mFilterEditor->setFocus(TRUE);
return true;
}
return LLFloater::handleKeyHere(key, mask);
}
void FSFloaterGroupTitles::changed(LLGroupChange gc)
{
switch (gc)

2
indra/newview/fsfloatergrouptitles.h
View File

@ -58,6 +58,8 @@ public:
virtual ~FSFloaterGroupTitles();
/*virtual*/ BOOL postBuild();
/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
/*virtual*/ bool hasAccelerators() const { return true; }
virtual void changed(LLGroupChange gc);
bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata); // called on agent group list changes