Place clones behind the original sprite

Author: adazem009

src/scratch/sprite.cpp

@@ -99,6 +99,9 @@ std::shared_ptr<Sprite> Sprite::clone()
         if (impl->iface)
             impl->iface->onCloned(clone.get());
 
+        // Place the clone behind the original sprite
+        eng->moveSpriteBehindOther(clone.get(), this);
+
         return clone;
     }
 

test/blocks/control_blocks_test.cpp

@@ -907,6 +907,7 @@ TEST_F(ControlBlocksTest, CreateCloneOfImpl)
     EXPECT_CALL(m_engineMock, cloneLimit()).Times(8).WillRepeatedly(Return(300));
     EXPECT_CALL(m_engineMock, cloneCount()).Times(4).WillRepeatedly(Return(0));
     EXPECT_CALL(m_engineMock, initClone).WillOnce(SaveArg<0>(&clone1));
+    EXPECT_CALL(m_engineMock, moveSpriteBehindOther(_, &sprite));
     EXPECT_CALL(m_engineMock, requestRedraw());
 
     vm.setBytecode(bytecode1);
@@ -916,6 +917,7 @@ TEST_F(ControlBlocksTest, CreateCloneOfImpl)
     ASSERT_EQ(sprite.allChildren().size(), 1);
 
     EXPECT_CALL(m_engineMock, initClone).Times(1);
+    EXPECT_CALL(m_engineMock, moveSpriteBehindOther(_, &sprite));
     EXPECT_CALL(m_engineMock, requestRedraw());
 
     vm.setBytecode(bytecode2);
@@ -929,6 +931,7 @@ TEST_F(ControlBlocksTest, CreateCloneOfImpl)
     EXPECT_CALL(m_engineMock, findTarget).WillOnce(Return(4));
     EXPECT_CALL(m_engineMock, targetAt(4)).WillOnce(Return(&sprite));
     EXPECT_CALL(m_engineMock, initClone).WillOnce(SaveArg<0>(&clone3));
+    EXPECT_CALL(m_engineMock, moveSpriteBehindOther(_, &sprite));
     EXPECT_CALL(m_engineMock, requestRedraw());
 
     vm.setBytecode(bytecode3);
@@ -939,6 +942,7 @@ TEST_F(ControlBlocksTest, CreateCloneOfImpl)
     ASSERT_EQ(sprite.children(), sprite.allChildren());
 
     EXPECT_CALL(m_engineMock, initClone).Times(1);
+    EXPECT_CALL(m_engineMock, moveSpriteBehindOther(_, &sprite));
     EXPECT_CALL(m_engineMock, requestRedraw());
 
     vm.setBytecode(bytecode4);
@@ -994,6 +998,7 @@ TEST_F(ControlBlocksTest, DeleteThisCloneImpl)
     EXPECT_CALL(m_engineMock, cloneLimit()).Times(2).WillRepeatedly(Return(300));
     EXPECT_CALL(m_engineMock, cloneCount()).WillOnce(Return(0));
     EXPECT_CALL(m_engineMock, initClone(_)).WillOnce(SaveArg<0>(&clone));
+    EXPECT_CALL(m_engineMock, moveSpriteBehindOther(_, &sprite));
     EXPECT_CALL(m_engineMock, requestRedraw());
     sprite.clone();
     ASSERT_TRUE(clone);

test/scratch_classes/sprite_test.cpp

@@ -126,10 +126,12 @@ TEST(SpriteTest, Clone)
     EXPECT_CALL(engine, requestRedraw()).Times(2);
     EXPECT_CALL(engine, cloneLimit()).Times(6).WillRepeatedly(Return(300)); // clone count limit is tested later
 
-    Sprite *clone1;
+    Sprite *clone1, *clone1_2;
     EXPECT_CALL(engine, cloneCount()).WillOnce(Return(0));
     EXPECT_CALL(engine, initClone(_)).WillOnce(SaveArg<0>(&clone1));
+    EXPECT_CALL(engine, moveSpriteBehindOther(_, sprite.get())).WillOnce(SaveArg<0>(&clone1_2));
     ASSERT_EQ(sprite->clone().get(), clone1);
+    ASSERT_EQ(clone1, clone1_2);
     ASSERT_FALSE(sprite->isClone());
     ASSERT_EQ(sprite->cloneRoot(), nullptr);
     ASSERT_EQ(sprite->cloneParent(), nullptr);
@@ -143,10 +145,12 @@ TEST(SpriteTest, Clone)
     // Modify root sprite data to make sure parent is used
     sprite->setLayerOrder(3);
 
-    Sprite *clone2;
+    Sprite *clone2, *clone2_2;
     EXPECT_CALL(engine, cloneCount()).WillOnce(Return(1));
     EXPECT_CALL(engine, initClone(_)).WillOnce(SaveArg<0>(&clone2));
+    EXPECT_CALL(engine, moveSpriteBehindOther(_, clone1)).WillOnce(SaveArg<0>(&clone2_2));
     ASSERT_EQ(clone1->clone().get(), clone2);
+    ASSERT_EQ(clone2, clone2_2);
     ASSERT_TRUE(clone1->isClone());
     ASSERT_EQ(clone1->cloneRoot(), sprite.get());
     ASSERT_EQ(clone1->cloneParent(), sprite.get());
@@ -158,15 +162,19 @@ TEST(SpriteTest, Clone)
 
     sprite->setVisible(true);
 
-    Sprite *clone3;
+    Sprite *clone3, *clone3_2;
     EXPECT_CALL(engine, cloneCount()).WillOnce(Return(2));
     EXPECT_CALL(engine, initClone(_)).WillOnce(SaveArg<0>(&clone3));
+    EXPECT_CALL(engine, moveSpriteBehindOther(_, clone1)).WillOnce(SaveArg<0>(&clone3_2));
     ASSERT_EQ(clone1->clone().get(), clone3);
+    ASSERT_EQ(clone3, clone3_2);
 
-    Sprite *clone4;
+    Sprite *clone4, *clone4_2;
     EXPECT_CALL(engine, cloneLimit()).WillOnce(Return(-1));
     EXPECT_CALL(engine, initClone(_)).WillOnce(SaveArg<0>(&clone4));
+    EXPECT_CALL(engine, moveSpriteBehindOther(_, sprite.get())).WillOnce(SaveArg<0>(&clone4_2));
     ASSERT_EQ(sprite->clone().get(), clone4);
+    ASSERT_EQ(clone4, clone4_2);
 
     EXPECT_CALL(engine, cloneLimit()).Times(2).WillRepeatedly(Return(0));
     EXPECT_CALL(engine, cloneCount()).WillOnce(Return(0));

test/script/script_test.cpp

@@ -11,6 +11,7 @@
 using namespace libscratchcpp;
 
 using ::testing::Return;
+using ::testing::_;
 
 class ScriptTest : public testing::Test
 {
@@ -115,6 +116,7 @@ TEST_F(ScriptTest, Start)
     EXPECT_CALL(m_engine, cloneLimit()).Times(2).WillRepeatedly(Return(300));
     EXPECT_CALL(m_engine, cloneCount()).WillOnce(Return(0));
     EXPECT_CALL(m_engine, initClone).Times(1);
+    EXPECT_CALL(m_engine, moveSpriteBehindOther(_, &root));
     EXPECT_CALL(m_engine, requestRedraw());
     auto clone = root.clone();
 

test/target_interfaces/ispritehandler_test.cpp

@@ -27,16 +27,18 @@ class ISpriteHandlerTest : public testing::Test
 TEST_F(ISpriteHandlerTest, Clone)
 {
     Sprite *clone;
-    Sprite *cloneArg;
+    Sprite *cloneParam1, *cloneParam2;
     EXPECT_CALL(m_engine, cloneLimit()).Times(2).WillRepeatedly(Return(300));
     EXPECT_CALL(m_engine, cloneCount()).WillOnce(Return(0));
     EXPECT_CALL(m_engine, initClone(_)).WillOnce(SaveArg<0>(&clone));
-    EXPECT_CALL(m_handler, onCloned(_)).WillOnce(SaveArg<0>(&cloneArg));
+    EXPECT_CALL(m_engine, moveSpriteBehindOther(_, &m_sprite)).WillOnce(SaveArg<0>(&cloneParam1));
+    EXPECT_CALL(m_handler, onCloned(_)).WillOnce(SaveArg<0>(&cloneParam2));
     EXPECT_CALL(m_engine, requestRedraw());
 
     m_sprite.clone();
     ASSERT_TRUE(clone);
-    ASSERT_EQ(cloneArg, clone);
+    ASSERT_EQ(cloneParam1, clone);
+    ASSERT_EQ(cloneParam2, clone);
 
     // Engine is used during deletion, so let's just set it to nullptr (this is tested elsewhere)
     m_sprite.setEngine(nullptr);