AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 15:07:41 +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/SplitView.cpp
View File

@@ -51,13 +51,12 @@ SplitView::SplitView(ViewResources& system, View& parentView, Axis axis)
commitResources(system);
}
std::unique_ptr<View> SplitView::setContentView(int slot, std::unique_ptr<View>&& view)
View* SplitView::setContentView(int slot, View* view)
{
if (slot < 0 || slot > 1)
Log.report(LogVisor::FatalError, "out-of-range slot to RootView::SplitView::setContentView");
std::unique_ptr<View> ret;
m_views[slot].m_view.swap(ret);
m_views[slot].m_view = std::move(view);
View* ret = m_views[slot].m_view;
m_views[slot].m_view = view;
m_views[slot].m_mouseDown = false;
m_views[slot].m_mouseIn = false;
updateSize();