fix #106: Fix backdrop loading when loading another project

Author: adazem009

src/renderedtarget.cpp

@@ -199,6 +199,22 @@ void RenderedTarget::setEngine(IEngine *newEngine)
         return;
 
     m_engine = newEngine;
+    m_costume = nullptr;
+    m_costumesLoaded = false;
+
+    if (!m_skinsInherited) {
+        for (const auto &[costume, skin] : m_skins)
+            delete skin;
+
+        m_skins.clear();
+    }
+
+    m_skin = nullptr;
+    m_texture = Texture();
+    m_oldTexture = Texture();
+    clearGraphicEffects();
+    m_hullPoints.clear();
+
     emit engineChanged();
 }
 

src/stagemodel.cpp

@@ -79,10 +79,8 @@ void StageModel::onBubbleTextChanged(const std::string &text)
 
 void StageModel::loadCostume()
 {
-    if (m_renderedTarget && m_stage) {
-        if (m_stage)
-            m_renderedTarget->updateCostume(m_stage->currentCostume().get());
-    }
+    if (m_renderedTarget && m_stage)
+        m_renderedTarget->updateCostume(m_stage->currentCostume().get());
 }
 
 libscratchcpp::Stage *StageModel::stage() const
@@ -101,7 +99,6 @@ void StageModel::setRenderedTarget(IRenderedTarget *newRenderedTarget)
         return;
 
     m_renderedTarget = newRenderedTarget;
-    loadCostume();
 
     emit renderedTargetChanged();
 }

test/renderedtarget/renderedtarget_test.cpp

@@ -56,6 +56,8 @@ TEST_F(RenderedTargetTest, UpdateMethods)
     createContextAndSurface(&context, &surface);
     RenderedTarget parent; // a parent item is needed for setVisible() to work
     RenderedTarget target(&parent);
+    EngineMock engine;
+    target.setEngine(&engine);
     QSignalSpy mirrorHorizontallySpy(&target, &RenderedTarget::mirrorHorizontallyChanged);
     ASSERT_FALSE(target.costumesLoaded());
 
@@ -73,8 +75,6 @@ TEST_F(RenderedTargetTest, UpdateMethods)
     stage.addCostume(costume);
     target.loadCostumes();
     ASSERT_TRUE(target.costumesLoaded());
-    EngineMock engine;
-    target.setEngine(&engine);
 
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));

test/target_models/stagemodel_test.cpp

@@ -123,7 +123,6 @@ TEST(StageModelTest, RenderedTarget)
 
     RenderedTargetMock renderedTarget;
     QSignalSpy spy(&model, &StageModel::renderedTargetChanged);
-    EXPECT_CALL(renderedTarget, updateCostume(c2.get()));
     model.setRenderedTarget(&renderedTarget);
     ASSERT_EQ(spy.count(), 1);
     ASSERT_EQ(model.renderedTarget(), &renderedTarget);