Skip to content
Snippets Groups Projects
Commit 6918b292 authored by Paul Guslisty's avatar Paul Guslisty
Browse files

Fixed normal EXT-6997 (Fav bar: Pop-up menu for LM in overflow dropdown is...

Fixed normal EXT-6997 (Fav bar: Pop-up menu for LM in overflow dropdown is kept after LM was dragged away)

- Added menu hiding on left mouse down callback for drop down menu item

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/337/

--HG--
branch : product-engine
parent 5078f522
No related branches found
No related tags found
No related merge requests found
...@@ -1165,6 +1165,17 @@ void LLFavoritesBarCtrl::pastFromClipboard() const ...@@ -1165,6 +1165,17 @@ void LLFavoritesBarCtrl::pastFromClipboard() const
void LLFavoritesBarCtrl::onButtonMouseDown(LLUUID id, LLUICtrl* ctrl, S32 x, S32 y, MASK mask) void LLFavoritesBarCtrl::onButtonMouseDown(LLUUID id, LLUICtrl* ctrl, S32 x, S32 y, MASK mask)
{ {
// EXT-6997 (Fav bar: Pop-up menu for LM in overflow dropdown is kept after LM was dragged away)
// mInventoryItemsPopupMenuHandle.get() - is a pop-up menu (of items) in already opened dropdown menu.
// We have to check and set visibility of pop-up menu in such a way instead of using
// LLMenuHolderGL::hideMenus() because it will close both menus(dropdown and pop-up), but
// we need to close only pop-up menu while dropdown one should be still opened.
LLMenuGL* menu = (LLMenuGL*)mInventoryItemsPopupMenuHandle.get();
if(menu && menu->getVisible())
{
menu->setVisible(FALSE);
}
mDragItemId = id; mDragItemId = id;
mStartDrag = TRUE; mStartDrag = TRUE;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment