moved libs to submodules, small fix in Node move ctor

This commit is contained in:
2017-01-31 11:21:56 +00:00
parent a80556f418
commit d313e815d3
9 changed files with 33 additions and 12 deletions

View File

@@ -125,11 +125,11 @@ void App::update(float dt)
glEnable(GL_SCISSOR_TEST);
for (auto& n : layout)
{
auto box = n.m_clip;
glScissor(box.x, height - box.y - box.w, box.z, box.w);
if (n.m_widget)
{
auto box = n.m_widget->clip;
glScissor(box.x, height - box.y - box.w, box.z, box.w);
n.m_widget->draw();
}
}

View File

@@ -108,6 +108,9 @@ public:
Node&& operator=(Node&& o) { return std::forward<Node>(o); }
Node(Node&& o)
{
m_name = std::move(o.m_name);
m_path = std::move(o.m_path);
m_widget = std::move(o.m_widget);
m_children = std::move(o.m_children);
for (auto& c : m_children)
c.parent = this;