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

MAINT-839 FIXED [PUBLIC]Clicking at menu a second time does not close it.

master
andreykproductengine 2015-05-27 18:16:51 +03:00
parent 51eafb9ffe
commit 987b9fdae2
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
indra/llui/llmenugl.cpp
View File

@ -1457,23 +1457,15 @@ BOOL LLMenuItemBranchDownGL::handleMouseDown( S32 x, S32 y, MASK mask )
// switch to mouse control mode
LLMenuGL::setKeyboardMode(FALSE);
if (getVisible() && getHighlight() && getBranch())
if (getVisible() && isOpen())
{
// already open - hide menu
LLMenuGL::setKeyboardMode(FALSE);
for (child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
{
LLView* viewp = *child_it;
if (dynamic_cast<LLMenuGL*>(viewp) != NULL && viewp->getVisible())
{
viewp->setVisible(FALSE);
}
}
LLMenuGL::sMenuContainer->hideMenus();
}
else
{
onCommit();
}
make_ui_sound("UISndClick");
return TRUE;
}
@ -3642,8 +3634,24 @@ BOOL LLMenuHolderGL::handleMouseDown( S32 x, S32 y, MASK mask )
BOOL handled = LLView::childrenHandleMouseDown(x, y, mask) != NULL;
if (!handled)
{
// clicked off of menu, hide them all
hideMenus();
LLMenuGL* visible_menu = (LLMenuGL*)getVisibleMenu();
LLMenuItemGL* parent_menu = visible_menu ? visible_menu->getParentMenuItem() : NULL;
if (parent_menu && parent_menu->getVisible())
{
// don't hide menu if parent was hit
LLRect parent_rect;
parent_menu->localRectToOtherView(parent_menu->getLocalRect(), &parent_rect, this);
if (!parent_rect.pointInRect(x, y))
{
// clicked off of menu and parent, hide them all
hideMenus();
}
}
else
{
// no visible parent, clicked off of menu, hide them all
hideMenus();
}
}
return handled;
}