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

fix layer move nodes

Browse Source
This commit is contained in:
omigamedev
2019-11-10 13:51:02 +01:00
parent 8452bbe3e9
commit 35937ad4c6
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/node.cpp
View File

@@ -497,6 +497,8 @@ void Node::move_child(Node* n, int index)
{ {
App::I->ui_task([&] App::I->ui_task([&]
{ {
int count = YGNodeGetChildCount(y_node);
index = glm::clamp<int>(index, 0, count - 1);
YGNodeRemoveChild(y_node, n->y_node); YGNodeRemoveChild(y_node, n->y_node);
YGNodeInsertChild(y_node, n->y_node, index); YGNodeInsertChild(y_node, n->y_node, index);
auto it = std::find_if(m_children.begin(), m_children.end(), auto it = std::find_if(m_children.begin(), m_children.end(),
@@ -509,29 +511,14 @@ void Node::move_child(Node* n, int index)
void Node::move_child_front(Node* n) void Node::move_child_front(Node* n)
{ {
App::I->ui_task([&] int count = YGNodeGetChildCount(y_node);
{ move_child(n, count - 1);
int count = YGNodeGetChildCount(y_node);
move_child(n, count - 1);
});
} }
void Node::move_child_offset(Node* n, int offset) void Node::move_child_offset(Node* n, int offset)
{ {
App::I->ui_task([&] int idx = get_child_index(n);
{ move_child(n, idx + offset);
int count = YGNodeGetChildCount(y_node);
for (int i = 0; i < count; i++)
{
if (YGNodeGetChild(y_node, i) == n->y_node)
{
int new_index = glm::clamp<int>(i + offset, 0, count - 1);
YGNodeRemoveChild(y_node, n->y_node);
YGNodeInsertChild(y_node, n->y_node, new_index);
break;
}
}
});
} }
int Node::get_child_index(Node* n) int Node::get_child_index(Node* n)