Set costume scale based on sprite size

Author: adazem009

include/scratchcpp/sprite.h

@@ -47,6 +47,8 @@ class LIBSCRATCHCPP_EXPORT Sprite : public Target
         double size() const;
         void setSize(double newSize);
 
+        void setCurrentCostume(int newCostume);
+
         double direction() const;
         void setDirection(double newDirection);
 

src/scratch/sprite.cpp

@@ -5,6 +5,7 @@
 #include <scratchcpp/iengine.h>
 #include <scratchcpp/variable.h>
 #include <scratchcpp/list.h>
+#include <scratchcpp/costume.h>
 #include <cassert>
 
 #include "sprite_p.h"
@@ -181,6 +182,24 @@ void Sprite::setSize(double newSize)
     impl->size = newSize;
     if (impl->iface)
         impl->iface->onSizeChanged(impl->size);
+
+    // TODO: Make currentCostume() return the costume (not index)
+    auto costume = costumeAt(currentCostume() - 1);
+
+    if (costume)
+        costume->setScale(newSize / 100);
+}
+
+/*! Overrides Target#setCurrentCostume(). */
+void Sprite::setCurrentCostume(int newCostume)
+{
+    // TODO: Make currentCostume() return the costume (not index)
+    auto costume = costumeAt(newCostume - 1);
+
+    if (costume)
+        costume->setScale(impl->size / 100);
+
+    Target::setCurrentCostume(newCostume);
 }
 
 /*! Returns the direction. */

test/scratch_classes/sprite_test.cpp

@@ -209,10 +209,30 @@ TEST(SpriteTest, Y)
 
 TEST(SpriteTest, Size)
 {
+    auto c1 = std::make_shared<Costume>("", "", "");
+    auto c2 = std::make_shared<Costume>("", "", "");
+
     Sprite sprite;
     ASSERT_EQ(sprite.size(), 100);
+    sprite.addCostume(c1);
+    sprite.addCostume(c2);
+    sprite.setCurrentCostume(1);
+
+    ASSERT_EQ(c1->scale(), 1);
+
     sprite.setSize(63.724);
     ASSERT_EQ(sprite.size(), 63.724);
+    ASSERT_EQ(std::round(c1->scale() * 100000) / 100000, 0.63724);
+
+    sprite.setCurrentCostume(2);
+    ASSERT_EQ(std::round(c2->scale() * 100000) / 100000, 0.63724);
+
+    sprite.setSize(186.84);
+    ASSERT_EQ(sprite.size(), 186.84);
+    ASSERT_EQ(std::round(c2->scale() * 10000) / 10000, 1.8684);
+
+    sprite.setCurrentCostume(1);
+    ASSERT_EQ(std::round(c1->scale() * 10000) / 10000, 1.8684);
 }
 
 TEST(SpriteTest, Direction)