Merge pull request #990 from MihailRis/recursion-related-fixes

fix recursion-related bugs

src/graphics/ui/elements/InlineFrame.cpp

@@ -25,8 +25,12 @@ void InlineFrame::setDocument(const std::shared_ptr<UiDocument>& document) {
     if (document == nullptr) {
         return;
     }
+    auto newRoot = document->getRoot();
+    if (newRoot->hasParent()) {
+        return;
+    }
     this->document = document;
-    this->root = document->getRoot();
+    this->root = std::move(newRoot);
     add(root);
 
     root->setSize(size);

src/graphics/ui/elements/UINode.cpp

@@ -60,6 +60,10 @@ bool UINode::isHover() const {
     return hover;
 }
 
+bool UINode::hasParent() const {
+    return parent != nullptr;
+}
+
 void UINode::setParent(UINode* node) {
     parent = node;
 }
@@ -376,14 +380,14 @@ void UINode::setGravity(Gravity gravity) {
     }
 }
 
-bool UINode::isSubnodeOf(const UINode* node) {
+bool UINode::isDescendantOf(const UINode* node) {
     if (parent == nullptr) {
         return false;
     }
     if (parent == node) {
         return true;
     }
-    return parent->isSubnodeOf(node);
+    return parent->isDescendantOf(node);
 }
 
 void UINode::getIndices(

src/graphics/ui/elements/UINode.hpp

@@ -176,6 +176,7 @@ namespace gui {
         void setMouseOver(bool flag);
 
         virtual void setParent(UINode* node);
+        bool hasParent() const;
         UINode* getParent() const;
         std::shared_ptr<UINode> getParentShared() const;
 
@@ -290,7 +291,7 @@ namespace gui {
 
         virtual void setGravity(Gravity gravity);
 
-        bool isSubnodeOf(const UINode* node);
+        bool isDescendantOf(const UINode* node);
 
         /// @brief collect all nodes having id
         static void getIndices(

src/logic/scripting/lua/libs/libgui.cpp

@@ -165,6 +165,13 @@ static int l_container_set_interval(lua::State* L) {
 static int l_move_into(lua::State* L) {
     auto node = get_document_node(L, 1);
     auto dest = get_document_node(L, 2);
+    if (dest.node == nullptr) {
+        return 0;
+    }
+    if (dest.node->isDescendantOf(node.node.get())) {
+        luaL_error(L, "unable to move element to its descendant");
+        return 0;
+    }
     UINode::moveInto(
         node.node, std::dynamic_pointer_cast<Container>(dest.node)
     );