Add bubble change methods to ISpriteHandler

Author: adazem009

include/scratchcpp/ispritehandler.h

@@ -59,6 +59,12 @@ class LIBSCRATCHCPP_EXPORT ISpriteHandler
         /*! Called when all graphics effects are cleared. */
         virtual void onGraphicsEffectsCleared() = 0;
 
+        /*! Called when the bubble type changes. */
+        virtual void onBubbleTypeChanged(Target::BubbleType type) = 0;
+
+        /*! Called when the bubble text changes. */
+        virtual void onBubbleTextChanged(const std::string &text) = 0;
+
         /*!
          * Used to get the bounding rectangle of the sprite.
          * \note The rectangle must be relative to the stage, so make sure to use the sprite's coordinates.

include/scratchcpp/sprite.h

@@ -76,6 +76,9 @@ class LIBSCRATCHCPP_EXPORT Sprite
 
         void clearGraphicsEffects() override;
 
+        virtual void setBubbleType(Target::BubbleType type) override;
+        virtual void setBubbleText(const std::string &text) override;
+
     private:
         Target *dataSource() const override;
         void setXY(double x, double y);

src/scratch/sprite.cpp

@@ -429,6 +429,31 @@ void Sprite::clearGraphicsEffects()
         impl->iface->onGraphicsEffectsCleared();
 }
 
+/*! Overrides Target#setBubbleType(). */
+void Sprite::setBubbleType(BubbleType type)
+{
+    Target::setBubbleType(type);
+
+    if (impl->iface)
+        impl->iface->onBubbleTypeChanged(type);
+}
+
+/*! Overrides Target#setBubbleText(). */
+void Sprite::setBubbleText(const std::string &text)
+{
+    Target::setBubbleText(text);
+
+    if (impl->visible && !text.empty()) {
+        IEngine *eng = engine();
+
+        if (eng)
+            eng->requestRedraw();
+    }
+
+    if (impl->iface)
+        impl->iface->onBubbleTextChanged(text);
+}
+
 Target *Sprite::dataSource() const
 {
     return impl->cloneSprite;

test/mocks/spritehandlermock.h

@@ -25,6 +25,8 @@ class SpriteHandlerMock : public ISpriteHandler
         MOCK_METHOD(void, onLayerOrderChanged, (int), (override));
         MOCK_METHOD(void, onGraphicsEffectChanged, (IGraphicsEffect *, double), (override));
         MOCK_METHOD(void, onGraphicsEffectsCleared, (), (override));
+        MOCK_METHOD(void, onBubbleTypeChanged, (Target::BubbleType), (override));
+        MOCK_METHOD(void, onBubbleTextChanged, (const std::string &), (override));
 
         MOCK_METHOD(Rect, boundingRect, (), (const, override));
 };

test/scratch_classes/sprite_test.cpp

@@ -632,3 +632,27 @@ TEST(SpriteTest, GraphicsEffects)
     ASSERT_EQ(sprite.graphicsEffectValue(&effect1), 0);
     ASSERT_EQ(sprite.graphicsEffectValue(&effect2), 0);
 }
+
+TEST(SpriteTest, BubbleType)
+{
+    Sprite sprite;
+    ASSERT_EQ(sprite.bubbleType(), Target::BubbleType::Say);
+
+    sprite.setBubbleType(Target::BubbleType::Think);
+    ASSERT_EQ(sprite.bubbleType(), Target::BubbleType::Think);
+
+    sprite.setBubbleType(Target::BubbleType::Say);
+    ASSERT_EQ(sprite.bubbleType(), Target::BubbleType::Say);
+}
+
+TEST(SpriteTest, BubbleText)
+{
+    Sprite sprite;
+    ASSERT_TRUE(sprite.bubbleText().empty());
+
+    sprite.setBubbleText("hello");
+    ASSERT_EQ(sprite.bubbleText(), "hello");
+
+    sprite.setBubbleText("world");
+    ASSERT_EQ(sprite.bubbleText(), "world");
+}

test/target_interfaces/ispritehandler_test.cpp

@@ -174,6 +174,22 @@ TEST_F(ISpriteHandlerTest, GraphicsEffects)
     m_sprite.clearGraphicsEffects();
 }
 
+TEST_F(ISpriteHandlerTest, BubbleType)
+{
+    EXPECT_CALL(m_handler, onBubbleTypeChanged(Target::BubbleType::Say));
+    m_sprite.setBubbleType(Target::BubbleType::Say);
+
+    EXPECT_CALL(m_handler, onBubbleTypeChanged(Target::BubbleType::Think));
+    m_sprite.setBubbleType(Target::BubbleType::Think);
+}
+
+TEST_F(ISpriteHandlerTest, BubbleText)
+{
+    EXPECT_CALL(m_handler, onBubbleTextChanged("test"));
+    EXPECT_CALL(m_engine, requestRedraw());
+    m_sprite.setBubbleText("test");
+}
+
 TEST_F(ISpriteHandlerTest, BoundingRect)
 {
     EXPECT_CALL(m_handler, boundingRect()).WillOnce(Return(Rect(-44.6, 89.1, 20.5, -0.48)));