Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore esc key behavior.

Browse Source
This commit is contained in:
Shyotl
2012-03-03 04:31:06 -06:00
parent 502b2d30d4
commit 9f2b668424
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llui/llmenugl.cpp
View File

@@ -3566,7 +3566,7 @@ BOOL LLPieMenu::handleMouseDown( S32 x, S32 y, MASK mask )
} }
// always handle mouse down as mouse up will close open menus // always handle mouse down as mouse up will close open menus
return handled; return TRUE;
} }
BOOL LLPieMenu::handleRightMouseDown(S32 x, S32 y, MASK mask) BOOL LLPieMenu::handleRightMouseDown(S32 x, S32 y, MASK mask)
@@ -4187,7 +4187,8 @@ BOOL LLMenuBarGL::handleAcceleratorKey(KEY key, MASK mask)
if(!result if(!result
&& (key == KEY_F10 && mask == MASK_CONTROL) && (key == KEY_F10 && mask == MASK_CONTROL)
&& !gKeyboard->getKeyRepeated(key)) && !gKeyboard->getKeyRepeated(key)
&& isInVisibleChain())
{ {
if (getHighlightedItem()) if (getHighlightedItem())
{ {
@@ -4613,7 +4614,7 @@ LLView* const LLMenuHolderGL::getVisibleMenu() const
for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it) for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
{ {
LLView* viewp = *child_it; LLView* viewp = *child_it;
if (viewp->getVisible() && dynamic_cast<LLMenuGL*>(viewp) != NULL) if (viewp->getVisible() && dynamic_cast<LLMenuGL*>(viewp) != NULL && !dynamic_cast<LLMenuBarGL*>(viewp))
{ {
return viewp; return viewp;
} }