asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow negative indices in move_child()

Browse source
This commit is contained in:
kobewi 2022-09-10 03:54:04 +02:00
parent ce6f284e5f
commit 31e62ca827
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/classes/Node.xml
View file

@ -514,7 +514,7 @@
<param index="0" name="child_node" type="Node" />
<param index="1" name="to_position" type="int" />
<description>
Moves a child node to a different position (order) among the other children. Since calls, signals, etc are performed by tree order, changing the order of children nodes may be useful.
Moves a child node to a different position (order) among the other children. Since calls, signals, etc are performed by tree order, changing the order of children nodes may be useful. If [param to_position] is negative, the index will be counted from the end.
[b]Note:[/b] Internal children can only be moved within their expected "internal range" (see [code]internal[/code] parameter in [method add_child]).
</description>
</method>

2
scene/main/canvas_item.cpp
View file

@ -373,7 +373,7 @@ void CanvasItem::move_to_front() {
if (!get_parent()) {
return;
}
get_parent()->move_child(this, get_parent()->get_child_count() - 1);
get_parent()->move_child(this, -1);
}
void CanvasItem::set_modulate(const Color &p_modulate) {

9
scene/main/node.cpp
View file

@ -328,12 +328,21 @@ void Node::move_child(Node *p_child, int p_pos) {
// We need to check whether node is internal and move it only in the relevant node range.
if (p_child->_is_internal_front()) {
if (p_pos < 0) {
p_pos += data.internal_children_front;
}
ERR_FAIL_INDEX_MSG(p_pos, data.internal_children_front, vformat("Invalid new child position: %d. Child is internal.", p_pos));
_move_child(p_child, p_pos);
} else if (p_child->_is_internal_back()) {
if (p_pos < 0) {
p_pos += data.internal_children_back;
}
ERR_FAIL_INDEX_MSG(p_pos, data.internal_children_back, vformat("Invalid new child position: %d. Child is internal.", p_pos));
_move_child(p_child, data.children.size() - data.internal_children_back + p_pos);
} else {
if (p_pos < 0) {
p_pos += get_child_count(false);
}
ERR_FAIL_INDEX_MSG(p_pos, data.children.size() + 1 - data.internal_children_front - data.internal_children_back, vformat("Invalid new child position: %d.", p_pos));
_move_child(p_child, p_pos + data.internal_children_front);
}