AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Removed view ownership (client should do this)

Browse Source
This commit is contained in:
Jack Andersen
2015-12-09 17:14:38 -10:00
parent d58d8c2391
commit cb2df22ec2
11 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
specter/lib/Space.cpp
View File

@@ -13,11 +13,10 @@ Space::Space(ViewResources& res, View& parentView, Toolbar::Position tbPos)
m_toolbar.reset(new Toolbar(res, *this, tbPos));
}
std::unique_ptr<View> Space::setContentView(std::unique_ptr<View>&& view)
View* Space::setContentView(View* view)
{
std::unique_ptr<View> ret;
m_contentView.swap(ret);
m_contentView = std::move(view);
View* ret = m_contentView;
m_contentView = view;
updateSize();
return ret;
}