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

Fix the inventory floater resize bug

Browse Source 
Thanks for catching this, Deltek.
This commit is contained in:
Lirusaito
2019-05-05 18:24:27 -04:00
parent 7773f6b4f7
commit 623b993fa9
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/lffloaterinvpanel.cpp
View File

@@ -31,17 +31,9 @@
LFFloaterInvPanel::LFFloaterInvPanel(const LLSD& cat, const std::string& name, LLInventoryModel* model) LFFloaterInvPanel::LFFloaterInvPanel(const LLSD& cat, const std::string& name, LLInventoryModel* model)
: LLInstanceTracker<LFFloaterInvPanel, LLSD>(cat) : LLInstanceTracker<LFFloaterInvPanel, LLSD>(cat)
{ {
mCommitCallbackRegistrar.add("InvPanel.Search", boost::bind(&LLInventoryPanel::setFilterSubString, boost::ref(mPanel), _2)); // Setup the floater first
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inv_panel.xml"); mPanel = new LLInventoryPanel("inv_panel", LLInventoryPanel::DEFAULT_SORT_ORDER, cat, LLRect(), model ? model : &gInventory, true);
LLPanel* panel = getChild<LLPanel>("placeholder_panel"); const auto& title = name.empty() ? gInventory.getCategory(mPanel->getRootFolderID())->getName() : name;
mPanel = new LLInventoryPanel("inv_panel", LLInventoryPanel::DEFAULT_SORT_ORDER, cat, panel->getRect(), model ? model : &gInventory, true);
mPanel->postBuild();
mPanel->setFollows(FOLLOWS_ALL);
mPanel->setEnabled(true);
addChild(mPanel);
removeChild(panel);
const auto& title = name.empty() ? mPanel->getRootFolder()->getName() : name;
setTitle(title);
// Figure out a unique name for our rect control // Figure out a unique name for our rect control
const auto rect_control = llformat("FloaterInv%sRect", boost::algorithm::erase_all_copy(title, " ").data()); const auto rect_control = llformat("FloaterInv%sRect", boost::algorithm::erase_all_copy(title, " ").data());
@@ -52,6 +44,22 @@ LFFloaterInvPanel::LFFloaterInvPanel(const LLSD& cat, const std::string& name, L
gSavedSettings.declareRect(rect_control, getRect(), "Rectangle for " + title + " window"); gSavedSettings.declareRect(rect_control, getRect(), "Rectangle for " + title + " window");
setRectControl(rect_control); setRectControl(rect_control);
// Load from XUI
mCommitCallbackRegistrar.add("InvPanel.Search", boost::bind(&LLInventoryPanel::setFilterSubString, boost::ref(mPanel), _2));
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inv_panel.xml");
// Now set the title
setTitle(title);
// Now take care of the children
LLPanel* panel = getChild<LLPanel>("placeholder_panel");
mPanel->setRect(panel->getRect());
mPanel->postBuild();
mPanel->setFollows(FOLLOWS_ALL);
mPanel->setEnabled(true);
addChild(mPanel);
removeChild(panel);
} }
LFFloaterInvPanel::~LFFloaterInvPanel() LFFloaterInvPanel::~LFFloaterInvPanel()