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

Hook up the menu the old fashioned way

Browse Source
This commit is contained in:
Lirusaito
2019-03-04 20:31:17 -05:00
parent fcb751ae4a
commit d770034e5c
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llfloatermarketplacelistings.cpp
View File

@@ -55,8 +55,6 @@ LLPanelMarketplaceListings::LLPanelMarketplaceListings()
, mSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME) , mSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME)
, mFilterListingFoldersOnly(false) , mFilterListingFoldersOnly(false)
{ {
mCommitCallbackRegistrar.add("Marketplace.ViewSort.Action", boost::bind(&LLPanelMarketplaceListings::onViewSortMenuItemClicked, this, _2));
mEnableCallbackRegistrar.add("Marketplace.ViewSort.CheckItem", boost::bind(&LLPanelMarketplaceListings::onViewSortMenuItemCheck, this, _2));
} }
LLPanelMarketplaceListings::~LLPanelMarketplaceListings() { delete mMenu; } LLPanelMarketplaceListings::~LLPanelMarketplaceListings() { delete mMenu; }
@@ -68,12 +66,31 @@ void showMenu(LLView* button, LLMenuGL* menu)
const auto& rect = button->getRect(); const auto& rect = button->getRect();
LLMenuGL::showPopup(button, menu, rect.mLeft, rect.mBottom); LLMenuGL::showPopup(button, menu, rect.mLeft, rect.mBottom);
} }
struct MarketplaceViewSortAction : public LLMemberListener<LLPanelMarketplaceListings>
{
bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata)
{
mPtr->onViewSortMenuItemClicked(userdata["data"]);
return true;
}
};
struct MarketplaceViewSortCheckItem : public LLMemberListener<LLPanelMarketplaceListings>
{
bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata)
{
LLMenuGL::sMenuContainer->findControl(userdata["control"].asString())->setValue(mPtr->onViewSortMenuItemCheck(userdata["data"]));
return true;
}
};
BOOL LLPanelMarketplaceListings::postBuild() BOOL LLPanelMarketplaceListings::postBuild()
{ {
childSetAction("add_btn", boost::bind(&LLPanelMarketplaceListings::onAddButtonClicked, this)); childSetAction("add_btn", boost::bind(&LLPanelMarketplaceListings::onAddButtonClicked, this));
childSetAction("audit_btn", boost::bind(&LLPanelMarketplaceListings::onAuditButtonClicked, this)); childSetAction("audit_btn", boost::bind(&LLPanelMarketplaceListings::onAuditButtonClicked, this));
mMenu = LLUICtrlFactory::instance().buildMenu("menu_marketplace_view.xml", LLMenuGL::sMenuContainer); mMenu = LLUICtrlFactory::instance().buildMenu("menu_marketplace_view.xml", LLMenuGL::sMenuContainer);
(new MarketplaceViewSortAction)->registerListener(this, "Marketplace.ViewSort.Action");
(new MarketplaceViewSortCheckItem)->registerListener(this, "Marketplace.ViewSort.CheckItem");
auto sort = getChild<LLUICtrl>("sort_btn"); auto sort = getChild<LLUICtrl>("sort_btn");
sort->setCommitCallback(boost::bind(showMenu, _1, mMenu)); sort->setCommitCallback(boost::bind(showMenu, _1, mMenu));

3
indra/newview/llfloatermarketplacelistings.h
View File

@@ -65,6 +65,9 @@ public:
void buildAllPanels(); void buildAllPanels();
private: private:
friend struct MarketplaceViewSortAction;
friend struct MarketplaceViewSortCheckItem;
LLInventoryPanel* buildInventoryPanel(const std::string& childname, const std::string& filename); LLInventoryPanel* buildInventoryPanel(const std::string& childname, const std::string& filename);
// UI callbacks // UI callbacks