Use parent block to determine whether a block is top level

Author: adazem009

include/scratchcpp/block.h

@@ -53,7 +53,6 @@ class LIBSCRATCHCPP_EXPORT Block : public Entity
         void setShadow(bool newShadow);
 
         bool topLevel() const;
-        void setTopLevel(bool newTopLevel);
 
         void setEngine(IEngine *newEngine);
 

src/internal/scratch3reader.cpp

@@ -177,10 +177,6 @@ bool Scratch3Reader::load()
                 READER_STEP(step, "target -> block -> shadow");
                 block->setShadow(blockInfo["shadow"]);
 
-                // topLevel
-                READER_STEP(step, "target -> block -> topLevel");
-                block->setTopLevel(blockInfo["topLevel"]);
-
                 target->addBlock(block);
             }
 

src/scratch/block.cpp

@@ -222,15 +222,7 @@ void Block::setShadow(bool newShadow)
 /*! Returns true if this is a top level block. */
 bool Block::topLevel() const
 {
-    // TODO: Return true if parentId() == ""
-    // and remove the setter
-    return impl->topLevel;
-}
-
-/*! Toggles whether this block is a top level block. */
-void Block::setTopLevel(bool newTopLevel)
-{
-    impl->topLevel = newTopLevel;
+    return (impl->parentId == "" && !impl->parent);
 }
 
 /*! Sets the Engine. */

src/scratch/block_p.h

@@ -29,7 +29,6 @@ struct BlockPrivate
         std::vector<std::shared_ptr<Field>> fields;
         std::unordered_map<int, Field *> fieldMap;
         bool shadow = false;
-        bool topLevel = false;
         IEngine *engine = nullptr;
         Target *target = nullptr;
         BlockPrototype mutationPrototype;