Skip to content
Snippets Groups Projects
Commit a555f635 authored by Mnikolenko ProductEngine's avatar Mnikolenko ProductEngine
Browse files

MAINT-729 FIXED Hide popup menu (which belongs to old chiclet) when new chiclet arrives.

parent c7c62b96
No related branches found
No related tags found
No related merge requests found
...@@ -376,6 +376,14 @@ BOOL LLIMChiclet::handleRightMouseDown(S32 x, S32 y, MASK mask) ...@@ -376,6 +376,14 @@ BOOL LLIMChiclet::handleRightMouseDown(S32 x, S32 y, MASK mask)
return TRUE; return TRUE;
} }
void LLIMChiclet::hidePopupMenu()
{
if (mPopupMenu)
{
mPopupMenu->setVisible(FALSE);
}
}
bool LLIMChiclet::canCreateMenu() bool LLIMChiclet::canCreateMenu()
{ {
if(mPopupMenu) if(mPopupMenu)
......
...@@ -305,6 +305,8 @@ class LLIMChiclet : public LLChiclet ...@@ -305,6 +305,8 @@ class LLIMChiclet : public LLChiclet
*/ */
virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
void hidePopupMenu();
protected: protected:
LLIMChiclet(const LLIMChiclet::Params& p); LLIMChiclet(const LLIMChiclet::Params& p);
......
...@@ -378,6 +378,7 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id) ...@@ -378,6 +378,7 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
{ {
// Pass the new_message icon state further. // Pass the new_message icon state further.
set_new_message = chicletp->getShowNewMessagesIcon(); set_new_message = chicletp->getShowNewMessagesIcon();
chicletp->hidePopupMenu();
} }
} }
......
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