diff options
author | Paul Guslisty <pguslisty@productengine.com> | 2010-10-07 13:46:50 +0300 |
---|---|---|
committer | Paul Guslisty <pguslisty@productengine.com> | 2010-10-07 13:46:50 +0300 |
commit | 6589c200199e1fe0d0bf5f610d990ae197108981 (patch) | |
tree | 2b041ce2366bbe8345598a61ec90852a8a1ac768 /indra/newview/llpanelpeople.h | |
parent | 7d9ec365cc815fad03c31bfaf9acf5d871c2e11b (diff) |
STORM-263 FIXED Cog button in lower-left of sidebar panel does not close popup menu on second click
- In all places of sidebar panel where gear menu button is used changed type of gear menu buttons from LLButton to LLMenuButton
- Added setMenuPosition and setMenu to the LLMenuButton interface as public methods
- In all sidebar panels where LLButton was replaced with LLMenuButton the algorithm of replacing is simple and the same for all sidebar panels.
In general the algorithm is:
1. set gearMenu to the menuButton using LLMenuButton::setMenu
2. set mouse down callback for the menuButton
3. in callback for mouse down set the menu position where it should be shown using LLMenuButton::setMenuPosition
Diffstat (limited to 'indra/newview/llpanelpeople.h')
-rw-r--r-- | indra/newview/llpanelpeople.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h index d0913ee756..3109feef0c 100644 --- a/indra/newview/llpanelpeople.h +++ b/indra/newview/llpanelpeople.h @@ -30,6 +30,7 @@ #include <llpanel.h> #include "llcallingcard.h" // for avatar tracker +#include "llmenubutton.h" #include "llvoiceclient.h" class LLFilterEditor; @@ -100,10 +101,7 @@ private: void onShareButtonClicked(); void onMoreButtonClicked(); void onActivateButtonClicked(); - void onRecentViewSortButtonClicked(); - void onNearbyViewSortButtonClicked(); - void onFriendsViewSortButtonClicked(); - void onGroupsViewSortButtonClicked(); + void onViewSortButtonClicked(); void onAvatarListDoubleClicked(LLUICtrl* ctrl); void onAvatarListCommitted(LLAvatarList* list); void onGroupPlusButtonClicked(); @@ -157,6 +155,11 @@ private: Updater* mNearbyListUpdater; Updater* mRecentListUpdater; + LLMenuButton* mNearbyGearButton; + LLMenuButton* mFriendsGearButton; + LLMenuButton* mGroupsGearButton; + LLMenuButton* mRecentGearButton; + std::string mFilterSubString; std::string mFilterSubStringOrig; }; |