omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a really bad bug using parent instead if this to set children's parent

Browse Source
This commit is contained in:
omigamedev
2017-02-02 22:52:06 +00:00
parent d2f59c3ea1
commit 5df2484c27
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/layout.cpp
View File

@@ -205,8 +205,7 @@ void Node::load_internal(const tinyxml2::XMLElement* x_node)
auto id = const_hash(ids); auto id = const_hash(ids);
auto& ref = (*m_manager)[id]; auto& ref = (*m_manager)[id];
m_children.push_back(ref.clone()); m_children.push_back(ref.clone());
m_children.back().parent = parent; m_children.back().parent = this;
m_children.back().m_manager = m_manager;
YGNodeInsertChild(y_node, m_children.back().y_node, YGNodeGetChildCount(y_node)); YGNodeInsertChild(y_node, m_children.back().y_node, YGNodeGetChildCount(y_node));
} }
else else
@@ -228,6 +227,7 @@ Node Node::clone()
YGNodeCopyStyle(n.y_node, y_node); YGNodeCopyStyle(n.y_node, y_node);
if (m_widget) if (m_widget)
n.m_widget = m_widget->clone(); n.m_widget = m_widget->clone();
n.m_manager = m_manager;
for (auto& c : m_children) for (auto& c : m_children)
{ {
n.m_children.push_back(std::move(c.clone())); n.m_children.push_back(std::move(c.clone()));