Use TextBubble class for text bubbles

Author: adazem009

include/scratchcpp/ispritehandler.h

@@ -59,12 +59,6 @@ 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 current costume width. */
         virtual int costumeWidth() const = 0;
 

include/scratchcpp/istagehandler.h

@@ -40,12 +40,6 @@ class LIBSCRATCHCPP_EXPORT IStageHandler
         /*! 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 current costume width. */
         virtual int costumeWidth() const = 0;
 

include/scratchcpp/sprite.h

@@ -88,9 +88,6 @@ 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;
         bool touchingClones(const std::vector<Sprite *> &clones) const override;

include/scratchcpp/stage.h

@@ -62,9 +62,6 @@ class LIBSCRATCHCPP_EXPORT Stage : public Target
 
         void clearGraphicsEffects() override;
 
-        virtual void setBubbleType(Target::BubbleType type) override;
-        virtual void setBubbleText(const std::string &text) override;
-
     private:
         bool touchingClones(const std::vector<Sprite *> &clones) const override;
 

include/scratchcpp/target.h

@@ -19,19 +19,14 @@ class Comment;
 class Costume;
 class Sound;
 class Sprite;
+class TextBubble;
 class IGraphicsEffect;
 class TargetPrivate;
 
 /*! \brief The Target class is the Stage or a Sprite. */
 class LIBSCRATCHCPP_EXPORT Target : public Drawable
 {
     public:
-        enum class BubbleType
-        {
-            Say,
-            Think
-        };
-
         Target();
         Target(const Target &) = delete;
         virtual ~Target() { }
@@ -104,11 +99,8 @@ class LIBSCRATCHCPP_EXPORT Target : public Drawable
 
         virtual void clearGraphicsEffects();
 
-        BubbleType bubbleType() const;
-        virtual void setBubbleType(BubbleType type);
-
-        const std::string &bubbleText() const;
-        virtual void setBubbleText(const std::string &text);
+        TextBubble *bubble();
+        const TextBubble *bubble() const;
 
         IEngine *engine() const;
         void setEngine(IEngine *engine);

src/blocks/looksblocks.cpp

@@ -115,7 +115,7 @@ void LooksBlocks::onInit(IEngine *engine)
         const auto &targets = engine->targets();
 
         for (auto target : targets) {
-            target->setBubbleText("");
+            target->bubble()->setText("");
             target->clearGraphicsEffects();
         }
     });
@@ -520,13 +520,13 @@ bool LooksBlocks::wait(VirtualMachine *vm)
     }
 }
 
-void LooksBlocks::showBubble(VirtualMachine *vm, Target::BubbleType type, const std::string &text)
+void LooksBlocks::showBubble(VirtualMachine *vm, TextBubble::Type type, const std::string &text)
 {
     Target *target = vm->target();
 
     if (target) {
-        target->setBubbleType(type);
-        target->setBubbleText(text);
+        target->bubble()->setType(type);
+        target->bubble()->setText(text);
         m_waitingBubbles.erase(target);
     }
 }
@@ -536,7 +536,7 @@ void LooksBlocks::hideBubble(Target *target)
     if (!target)
         return;
 
-    target->setBubbleText("");
+    target->bubble()->setText("");
     m_waitingBubbles.erase(target);
 }
 
@@ -545,7 +545,7 @@ unsigned int LooksBlocks::startSayForSecs(VirtualMachine *vm)
     Target *target = vm->target();
 
     if (target) {
-        showBubble(vm, Target::BubbleType::Say, vm->getInput(0, 2)->toString());
+        showBubble(vm, TextBubble::Type::Say, vm->getInput(0, 2)->toString());
         m_waitingBubbles[target] = vm;
         startWait(vm, vm->getInput(1, 2)->toDouble());
     }
@@ -572,7 +572,7 @@ unsigned int LooksBlocks::sayForSecs(VirtualMachine *vm)
 
 unsigned int LooksBlocks::say(VirtualMachine *vm)
 {
-    showBubble(vm, Target::BubbleType::Say, vm->getInput(0, 1)->toString());
+    showBubble(vm, TextBubble::Type::Say, vm->getInput(0, 1)->toString());
     return 1;
 }
 
@@ -581,7 +581,7 @@ unsigned int LooksBlocks::startThinkForSecs(VirtualMachine *vm)
     Target *target = vm->target();
 
     if (target) {
-        showBubble(vm, Target::BubbleType::Think, vm->getInput(0, 2)->toString());
+        showBubble(vm, TextBubble::Type::Think, vm->getInput(0, 2)->toString());
         m_waitingBubbles[target] = vm;
         startWait(vm, vm->getInput(1, 2)->toDouble());
     }
@@ -596,7 +596,7 @@ unsigned int LooksBlocks::thinkForSecs(VirtualMachine *vm)
 
 unsigned int LooksBlocks::think(VirtualMachine *vm)
 {
-    showBubble(vm, Target::BubbleType::Think, vm->getInput(0, 1)->toString());
+    showBubble(vm, TextBubble::Type::Think, vm->getInput(0, 1)->toString());
     return 1;
 }
 

src/blocks/looksblocks.h

@@ -4,6 +4,7 @@
 
 #include <scratchcpp/iextension.h>
 #include <scratchcpp/target.h>
+#include <scratchcpp/textbubble.h>
 #include <vector>
 #include <unordered_map>
 #include <chrono>
@@ -91,7 +92,7 @@ class LooksBlocks : public IExtension
 
         static void startWait(VirtualMachine *vm, double secs);
         static bool wait(VirtualMachine *vm);
-        static void showBubble(VirtualMachine *vm, Target::BubbleType type, const std::string &text);
+        static void showBubble(VirtualMachine *vm, TextBubble::Type type, const std::string &text);
         static void hideBubble(Target *target);
 
         static unsigned int startSayForSecs(VirtualMachine *vm);

src/blocks/sensingblocks.cpp

@@ -9,6 +9,7 @@
 #include <scratchcpp/field.h>
 #include <scratchcpp/sprite.h>
 #include <scratchcpp/stage.h>
+#include <scratchcpp/textbubble.h>
 #include <scratchcpp/costume.h>
 #include <scratchcpp/variable.h>
 #include <scratchcpp/block.h>
@@ -109,7 +110,7 @@ void SensingBlocks::onInit(IEngine *engine)
         if (!m_questionList.empty()) {
             // Abort the question of this thread if it's currently being displayed
             if (m_questionList.front()->vm == thread->vm()) {
-                thread->target()->setBubbleText("");
+                thread->target()->bubble()->setText("");
                 engine->questionAborted()();
             }
 
@@ -672,7 +673,7 @@ void SensingBlocks::onAnswer(const std::string &answer)
 
         // If the target was visible when asked, hide the say bubble unless the target was the stage
         if (question->wasVisible && !question->wasStage)
-            vm->target()->setBubbleText("");
+            vm->target()->bubble()->setText("");
 
         m_questionList.erase(m_questionList.begin());
         vm->resolvePromise();
@@ -1084,8 +1085,8 @@ void SensingBlocks::askNextQuestion()
     // If the target is visible, emit a blank question and show
     // a bubble unless the target was the stage
     if (question->wasVisible && !question->wasStage) {
-        target->setBubbleType(Target::BubbleType::Say);
-        target->setBubbleText(question->question);
+        target->bubble()->setType(TextBubble::Type::Say);
+        target->bubble()->setText(question->question);
 
         engine->questionAsked()("");
     } else {

src/scratch/sprite.cpp

@@ -8,6 +8,7 @@
 #include <scratchcpp/costume.h>
 #include <scratchcpp/sound.h>
 #include <scratchcpp/rect.h>
+#include <scratchcpp/textbubble.h>
 #include <cassert>
 #include <iostream>
 
@@ -20,6 +21,14 @@ Sprite::Sprite() :
     Target(),
     impl(spimpl::make_unique_impl<SpritePrivate>(this))
 {
+    bubble()->textChanged().connect([this](const std::string &text) {
+        if (impl->visible && !text.empty()) {
+            IEngine *eng = engine();
+
+            if (eng)
+                eng->requestRedraw();
+        }
+    });
 }
 
 /*! Sets the sprite interface. */
@@ -544,32 +553,6 @@ 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(impl->visible ? text : "");
-    const std::string &finalText = bubbleText();
-
-    if (impl->visible && !finalText.empty()) {
-        IEngine *eng = engine();
-
-        if (eng)
-            eng->requestRedraw();
-    }
-
-    if (impl->iface)
-        impl->iface->onBubbleTextChanged(impl->visible ? finalText : "");
-}
-
 Target *Sprite::dataSource() const
 {
     return impl->cloneSprite;

src/scratch/stage.cpp

@@ -3,6 +3,7 @@
 #include <scratchcpp/stage.h>
 #include <scratchcpp/istagehandler.h>
 #include <scratchcpp/iengine.h>
+#include <scratchcpp/textbubble.h>
 #include <cassert>
 
 #include "stage_p.h"
@@ -14,6 +15,14 @@ Stage::Stage() :
     Target(),
     impl(spimpl::make_unique_impl<StagePrivate>())
 {
+    bubble()->textChanged().connect([this](const std::string &text) {
+        if (!text.empty()) {
+            IEngine *eng = engine();
+
+            if (eng)
+                eng->requestRedraw();
+        }
+    });
 }
 
 /*! Sets the stage interface. */
@@ -220,32 +229,6 @@ void Stage::clearGraphicsEffects()
         impl->iface->onGraphicsEffectsCleared();
 }
 
-/*! Overrides Target#setBubbleType(). */
-void Stage::setBubbleType(BubbleType type)
-{
-    Target::setBubbleType(type);
-
-    if (impl->iface)
-        impl->iface->onBubbleTypeChanged(type);
-}
-
-/*! Overrides Target#setBubbleText(). */
-void Stage::setBubbleText(const std::string &text)
-{
-    Target::setBubbleText(text);
-    const std::string &finalText = bubbleText();
-
-    if (!finalText.empty()) {
-        IEngine *eng = engine();
-
-        if (eng)
-            eng->requestRedraw();
-    }
-
-    if (impl->iface)
-        impl->iface->onBubbleTextChanged(finalText);
-}
-
 bool Stage::touchingClones(const std::vector<Sprite *> &clones) const
 {
     if (!impl->iface)