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

LLMenuGL Sync

Browse Source
This commit is contained in:
Lirusaito
2019-01-21 12:07:04 -05:00
parent 95cd6cf775
commit c8d95e58c3
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
indra/llui/llmenugl.cpp
View File

@@ -70,7 +70,7 @@
using namespace LLOldEvents; using namespace LLOldEvents;
// static // static
LLMenuHolderGL *LLMenuGL::sMenuContainer = NULL; LLMenuHolderGL *LLMenuGL::sMenuContainer = nullptr;
S32 MENU_BAR_HEIGHT = 0; S32 MENU_BAR_HEIGHT = 0;
S32 MENU_BAR_WIDTH = 0; S32 MENU_BAR_WIDTH = 0;
@@ -258,7 +258,7 @@ BOOL LLMenuItemGL::handleRightMouseUp(S32 x, S32 y, MASK mask)
// if not, it will be added to the list // if not, it will be added to the list
BOOL LLMenuItemGL::addToAcceleratorList(std::list <LLKeyBinding*> *listp) BOOL LLMenuItemGL::addToAcceleratorList(std::list <LLKeyBinding*> *listp)
{ {
LLKeyBinding *accelerator = NULL; LLKeyBinding *accelerator = nullptr;
if (mAcceleratorKey != KEY_NONE) if (mAcceleratorKey != KEY_NONE)
{ {
@@ -268,19 +268,37 @@ BOOL LLMenuItemGL::addToAcceleratorList(std::list <LLKeyBinding*> *listp)
accelerator = *list_it; accelerator = *list_it;
if ((accelerator->mKey == mAcceleratorKey) && (accelerator->mMask == (mAcceleratorMask & MASK_NORMALKEYS))) if ((accelerator->mKey == mAcceleratorKey) && (accelerator->mMask == (mAcceleratorMask & MASK_NORMALKEYS)))
{ {
// *NOTE: get calling code to throw up warning or route
// warning messages back to app-provided output
// std::string warning;
// warning.append("Duplicate key binding <");
// appendAcceleratorString( warning );
// warning.append("> for menu items:\n ");
// warning.append(accelerator->mName);
// warning.append("\n ");
// warning.append(mLabel);
// LL_WARNS() << warning << LL_ENDL;
// LLAlertDialog::modalAlert(warning);
return FALSE; return FALSE;
} }
} }
if (!accelerator) if (!accelerator)
{ {
accelerator = new LLKeyBinding; try
if (accelerator)
{ {
accelerator = new LLKeyBinding;
accelerator->mKey = mAcceleratorKey; accelerator->mKey = mAcceleratorKey;
accelerator->mMask = (mAcceleratorMask & MASK_NORMALKEYS); accelerator->mMask = (mAcceleratorMask & MASK_NORMALKEYS);
// accelerator->mName = mLabel; // accelerator->mName = mLabel;
listp->push_back(accelerator);//addData(accelerator);
}
catch (const std::bad_alloc& e)
{
LL_WARNS() << "Failed to allocate memory for keybinding with exception: " << e.what() << LL_ENDL;
return FALSE;
} }
listp->push_back(accelerator);//addData(accelerator);
} }
} }
return TRUE; return TRUE;
@@ -681,7 +699,7 @@ class LLMenuItemVerticalSeparatorGL
public: public:
LLMenuItemVerticalSeparatorGL( void ); LLMenuItemVerticalSeparatorGL( void );
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; } BOOL handleMouseDown(S32 x, S32 y, MASK mask) override { return FALSE; }
}; };
LLMenuItemVerticalSeparatorGL::LLMenuItemVerticalSeparatorGL( void ) LLMenuItemVerticalSeparatorGL::LLMenuItemVerticalSeparatorGL( void )
@@ -733,7 +751,7 @@ LLFloater* LLMenuItemTearOffGL::getParentFloater()
} }
} }
return NULL; return nullptr;
} }
void LLMenuItemTearOffGL::onCommit() void LLMenuItemTearOffGL::onCommit()
@@ -4873,7 +4891,7 @@ void LLContextMenu::hide()
{ {
mHoverItem->setHighlight( FALSE ); mHoverItem->setHighlight( FALSE );
} }
mHoverItem = NULL; mHoverItem = nullptr;
} }