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

Prevent that annoying issue where new scroll list menu flashes in the bottom left corner briefly when created.\

Browse Source
This commit is contained in:
Inusaito Sayori
2013-07-31 01:36:29 -04:00
parent 545d104212
commit c4610214fc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llscrolllistctrl.cpp
View File

@@ -1742,6 +1742,7 @@ BOOL LLScrollListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
} }
gFocusMgr.setKeyboardFocus(this); // Menu listeners rely on this gFocusMgr.setKeyboardFocus(this); // Menu listeners rely on this
mPopupMenu->buildDrawLabels(); mPopupMenu->buildDrawLabels();
mPopupMenu->updateParent(LLMenuGL::sMenuContainer);
LLMenuGL::showPopup(this, mPopupMenu, x, y); LLMenuGL::showPopup(this, mPopupMenu, x, y);
return TRUE; return TRUE;
} }
@@ -2556,7 +2557,6 @@ void LLScrollListCtrl::setScrollListParameters(LLXMLNodePtr node)
std::string menu_file; std::string menu_file;
node->getAttributeString("menu_file", menu_file); node->getAttributeString("menu_file", menu_file);
mPopupMenu = LLUICtrlFactory::getInstance()->buildMenu(menu_file, LLMenuGL::sMenuContainer); mPopupMenu = LLUICtrlFactory::getInstance()->buildMenu(menu_file, LLMenuGL::sMenuContainer);
LLMenuGL::sMenuContainer->addChild(mPopupMenu);
} }
} }