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

Don't double up separators in the context menu

Browse Source
This commit is contained in:
Lirusaito
2019-01-22 00:49:09 -05:00
parent d0b7a983d1
commit 621c0a0249
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/llmenugl.cpp
View File

@@ -5001,7 +5001,11 @@ bool LLContextMenu::addChild(LLView* view, S32 tab_group)
if (LLContextMenu* context = dynamic_cast<LLContextMenu*>(view)) if (LLContextMenu* context = dynamic_cast<LLContextMenu*>(view))
return appendContextSubMenu(context); return appendContextSubMenu(context);
if (LLMenuItemGL* item = dynamic_cast<LLMenuItemGL*>(view)) if (LLMenuItemGL* item = dynamic_cast<LLMenuItemGL*>(view))
{
if (!mItems.empty() && mItems.back()->getType() == "separator" && item->getType() == "separator") // Singu TODO: Profile this? Does it matter?
item->setVisible(false);
return append(item); return append(item);
}
if (LLMenuGL* menu = dynamic_cast<LLMenuGL*>(view)) if (LLMenuGL* menu = dynamic_cast<LLMenuGL*>(view))
return appendMenu(menu); return appendMenu(menu);
return false; return false;
@@ -5042,7 +5046,7 @@ LLPieMenu::LLPieMenu(const std::string& name, const std::string& label)
// Separators on pie menus are invisible // Separators on pie menus are invisible
bool LLPieMenu::addChild(LLView* view, S32 tab_group) bool LLPieMenu::addChild(LLView* view, S32 tab_group)
{ {
if (LLContextMenu::addChild(view, tab_group)) if (LLContextMenu::addChild(view, tab_group) && view->getVisible())
{ {
LLMenuItemSeparatorGL* sep = dynamic_cast<LLMenuItemSeparatorGL*>(view); LLMenuItemSeparatorGL* sep = dynamic_cast<LLMenuItemSeparatorGL*>(view);
if(sep) if(sep)