Add sprite size limit

Author: adazem009

src/scratch/sprite.cpp

@@ -258,13 +258,21 @@ double Sprite::size() const
 /*! Sets the size. */
 void Sprite::setSize(double newSize)
 {
+    IEngine *engine = this->engine();
+
+    if (engine) {
+        const int oldWidth = currentCostumeWidth();
+        const int oldHeight = currentCostumeHeight();
+        const double minScale = std::min(1.0, std::max(5.0 / oldWidth, 5.0 / oldHeight));
+        const double maxScale = std::min((1.5 * engine->stageWidth()) / oldWidth, (1.5 * engine->stageHeight()) / oldHeight);
+        newSize = std::clamp(newSize, minScale * 100, maxScale * 100);
+    }
+
     impl->size = newSize;
 
     if (impl->visible) {
-        IEngine *eng = engine();
-
-        if (eng)
-            eng->requestRedraw();
+        if (engine)
+            engine->requestRedraw();
     }
 
     if (impl->iface)

test/scratch_classes/sprite_test.cpp

@@ -448,21 +448,43 @@ TEST(SpriteTest, Dragging)
 TEST(SpriteTest, Size)
 {
     Sprite sprite;
+    SpriteHandlerMock handler;
+    EXPECT_CALL(handler, init);
+    sprite.setInterface(&handler);
     ASSERT_EQ(sprite.size(), 100);
 
     EngineMock engine;
     sprite.setEngine(&engine);
-    EXPECT_CALL(engine, requestRedraw()).Times(4);
+    EXPECT_CALL(engine, requestRedraw()).WillRepeatedly(Return());
+    EXPECT_CALL(engine, stageWidth()).WillRepeatedly(Return(480));
+    EXPECT_CALL(engine, stageHeight()).WillRepeatedly(Return(360));
+    EXPECT_CALL(handler, onSizeChanged).WillRepeatedly(Return());
 
+    EXPECT_CALL(handler, costumeWidth()).WillRepeatedly(Return(50));
+    EXPECT_CALL(handler, costumeHeight()).WillRepeatedly(Return(30));
     sprite.setSize(63.724);
     ASSERT_EQ(sprite.size(), 63.724);
-
-    sprite.setCostumeIndex(1);
+    sprite.setSize(0);
+    ASSERT_EQ(std::round(sprite.size() * 100) / 100, 16.67);
+    sprite.setSize(2000);
+    ASSERT_EQ(sprite.size(), 1440);
+
+    EXPECT_CALL(handler, costumeWidth()).WillRepeatedly(Return(30));
+    EXPECT_CALL(handler, costumeHeight()).WillRepeatedly(Return(50));
+    sprite.setSize(0);
+    ASSERT_EQ(std::round(sprite.size() * 100) / 100, 16.67);
+    sprite.setSize(2000);
+    ASSERT_EQ(sprite.size(), 1080);
+
+    EXPECT_CALL(handler, costumeWidth()).WillRepeatedly(Return(88));
+    EXPECT_CALL(handler, costumeHeight()).WillRepeatedly(Return(88));
+    sprite.setSize(0);
+    ASSERT_EQ(std::round(sprite.size() * 100) / 100, 5.68);
+    sprite.setSize(2000);
+    ASSERT_EQ(std::round(sprite.size() * 100) / 100, 613.64);
 
     sprite.setSize(186.84);
     ASSERT_EQ(sprite.size(), 186.84);
-
-    sprite.setCostumeIndex(0);
 }
 
 TEST(SpriteTest, CostumeIndex)

test/target_interfaces/ispritehandler_test.cpp

@@ -116,9 +116,21 @@ TEST_F(ISpriteHandlerTest, Position)
 
 TEST_F(ISpriteHandlerTest, Size)
 {
-    EXPECT_CALL(m_handler, onSizeChanged(53.8)).Times(1);
+    EXPECT_CALL(m_handler, onSizeChanged(53.8));
+    EXPECT_CALL(m_handler, costumeWidth()).WillOnce(Return(100));
+    EXPECT_CALL(m_handler, costumeHeight()).WillOnce(Return(100));
+    EXPECT_CALL(m_engine, stageWidth()).WillOnce(Return(480));
+    EXPECT_CALL(m_engine, stageHeight()).WillOnce(Return(360));
     EXPECT_CALL(m_engine, requestRedraw());
     m_sprite.setSize(53.8);
+
+    EXPECT_CALL(m_handler, onSizeChanged(540));
+    EXPECT_CALL(m_handler, costumeWidth()).WillOnce(Return(100));
+    EXPECT_CALL(m_handler, costumeHeight()).WillOnce(Return(100));
+    EXPECT_CALL(m_engine, stageWidth()).WillOnce(Return(480));
+    EXPECT_CALL(m_engine, stageHeight()).WillOnce(Return(360));
+    EXPECT_CALL(m_engine, requestRedraw());
+    m_sprite.setSize(100000);
 }
 
 TEST_F(ISpriteHandlerTest, Direction)