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

FIRE-30003: (CTRL-)F10 can't be used as gesture trigger

meow-7.2.2
Ansariel 2020-08-16 22:49:26 +02:00
parent 1002968742
commit 5ae4be708a
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
indra/llui/llmenugl.cpp
View File

@ -3382,25 +3382,27 @@ BOOL LLMenuBarGL::handleAcceleratorKey(KEY key, MASK mask)
mAltKeyTrigger = FALSE;
}
if(!result
&& (key == KEY_F10 && mask == MASK_CONTROL)
&& !gKeyboard->getKeyRepeated(key)
&& isInVisibleChain())
{
if (getHighlightedItem())
{
clearHoverItem();
LLMenuGL::setKeyboardMode(FALSE);
}
else
{
// close menus originating from other menu bars when first opening menu via keyboard
LLMenuGL::sMenuContainer->hideMenus();
highlightNextItem(NULL);
LLMenuGL::setKeyboardMode(TRUE);
}
return TRUE;
}
// <FS:Ansariel> FIRE-30003: (CTRL-)F10 can't be used as gesture trigger
//if(!result
// && (key == KEY_F10 && mask == MASK_CONTROL)
// && !gKeyboard->getKeyRepeated(key)
// && isInVisibleChain())
//{
// if (getHighlightedItem())
// {
// clearHoverItem();
// LLMenuGL::setKeyboardMode(FALSE);
// }
// else
// {
// // close menus originating from other menu bars when first opening menu via keyboard
// LLMenuGL::sMenuContainer->hideMenus();
// highlightNextItem(NULL);
// LLMenuGL::setKeyboardMode(TRUE);
// }
// return TRUE;
//}
// </FS:Ansariel>
if (result && !getHighlightedItem() && LLMenuGL::sMenuContainer->hasVisibleMenu())
{