Request redraw on pen operations

Author: adazem009

src/spritemodel.cpp

@@ -2,6 +2,7 @@
 
 #include <scratchcpp/costume.h>
 #include <scratchcpp/rect.h>
+#include <scratchcpp/iengine.h>
 
 #include "spritemodel.h"
 #include "renderedtarget.h"
@@ -65,8 +66,13 @@ void SpriteModel::onYChanged(double y)
 
 void SpriteModel::onMoved(double oldX, double oldY, double newX, double newY)
 {
-    if (m_penDown && m_penLayer)
+    if (m_penDown && m_penLayer) {
         m_penLayer->drawLine(m_penAttributes, oldX, oldY, newX, newY);
+        libscratchcpp::IEngine *engine = m_sprite->engine();
+
+        if (engine)
+            engine->requestRedraw();
+    }
 }
 
 void SpriteModel::onSizeChanged(double size)
@@ -151,13 +157,15 @@ bool SpriteModel::penDown() const
 
 void SpriteModel::setPenDown(bool newPenDown)
 {
-    if (m_penDown == newPenDown)
-        return;
-
     m_penDown = newPenDown;
 
-    if (m_penDown && m_penLayer && m_sprite)
+    if (m_penDown && m_penLayer && m_sprite) {
         m_penLayer->drawPoint(m_penAttributes, m_sprite->x(), m_sprite->y());
+        libscratchcpp::IEngine *engine = m_sprite->engine();
+
+        if (engine)
+            engine->requestRedraw();
+    }
 }
 
 SpriteModel *SpriteModel::cloneRoot() const

test/target_models/spritemodel_test.cpp

@@ -3,6 +3,7 @@
 #include <spritemodel.h>
 #include <renderedtargetmock.h>
 #include <penlayermock.h>
+#include <enginemock.h>
 
 #include "../common.h"
 
@@ -149,17 +150,25 @@ TEST(SpriteModelTest, OnYChanged)
 TEST(SpriteModelTest, OnMoved)
 {
     SpriteModel model;
+    Sprite sprite;
+    EngineMock engine;
+    sprite.setEngine(&engine);
+    model.init(&sprite);
 
     PenLayerMock penLayer;
     model.setPenLayer(&penLayer);
 
     EXPECT_CALL(penLayer, drawLine).Times(0);
+    EXPECT_CALL(engine, requestRedraw).Times(0);
     model.onMoved(-15.6, 54.9, 159.04, -2.5);
 
+    EXPECT_CALL(penLayer, drawPoint);
+    EXPECT_CALL(engine, requestRedraw);
     model.setPenDown(true);
     PenAttributes &attr = model.penAttributes();
 
     EXPECT_CALL(penLayer, drawLine(_, -15.6, 54.9, 159.04, -2.5)).WillOnce(WithArgs<0>(Invoke([&attr](const PenAttributes &attrArg) { ASSERT_EQ(&attr, &attrArg); })));
+    EXPECT_CALL(engine, requestRedraw());
     model.onMoved(-15.6, 54.9, 159.04, -2.5);
 }
 
@@ -253,8 +262,10 @@ TEST(SpriteModelTest, PenDown)
 {
     SpriteModel model;
     Sprite sprite;
+    EngineMock engine;
     sprite.setX(24.6);
     sprite.setY(-48.8);
+    sprite.setEngine(&engine);
     model.init(&sprite);
     ASSERT_FALSE(model.penDown());
 
@@ -264,14 +275,17 @@ TEST(SpriteModelTest, PenDown)
     PenAttributes &attr = model.penAttributes();
 
     EXPECT_CALL(penLayer, drawPoint(_, 24.6, -48.8)).WillOnce(WithArgs<0>(Invoke([&attr](const PenAttributes &attrArg) { ASSERT_EQ(&attr, &attrArg); })));
+    EXPECT_CALL(engine, requestRedraw());
     model.setPenDown(true);
     ASSERT_TRUE(model.penDown());
 
-    EXPECT_CALL(penLayer, drawPoint).Times(0);
+    EXPECT_CALL(penLayer, drawPoint(_, 24.6, -48.8));
+    EXPECT_CALL(engine, requestRedraw());
     model.setPenDown(true);
     ASSERT_TRUE(model.penDown());
 
     EXPECT_CALL(penLayer, drawPoint).Times(0);
+    EXPECT_CALL(engine, requestRedraw).Times(0);
     model.setPenDown(false);
     ASSERT_FALSE(model.penDown());
 }