TextBubble: Add owner property

Author: adazem009

include/scratchcpp/textbubble.h

@@ -8,6 +8,7 @@
 namespace libscratchcpp
 {
 
+class Thread;
 class TextBubblePrivate;
 
 /*! \brief The TextBubble class represents a text bubble created using say or think block. */
@@ -31,8 +32,11 @@ class LIBSCRATCHCPP_EXPORT TextBubble : public Drawable
 
         const std::string &text() const;
         virtual void setText(const std::string &text);
+        virtual void setText(const std::string &text, Thread *owner);
         sigslot::signal<const std::string &> &textChanged() const;
 
+        Thread *owner() const;
+
     private:
         spimpl::unique_impl_ptr<TextBubblePrivate> impl;
 };

src/scratch/textbubble.cpp

@@ -53,10 +53,16 @@ const std::string &TextBubble::text() const
  * \note If the text is an empty string, the TextBubble is supposed to be hidden.
  */
 void TextBubble::setText(const std::string &text)
+{
+    setText(text, nullptr);
+}
+
+void TextBubble::setText(const std::string &text, Thread *owner)
 {
     // https://github.com/scratchfoundation/scratch-vm/blob/7313ce5199f8a3da7850085d0f7f6a3ca2c89bf6/src/blocks/scratch3_looks.js#L251-L257
     const Value v(text);
     std::string converted = text;
+    impl->owner = owner;
 
     // Non-integers should be rounded to 2 decimal places (no more, no less), unless they're small enough that rounding would display them as 0.00.
     if (v.isValidNumber()) {
@@ -87,3 +93,9 @@ sigslot::signal<const std::string &> &TextBubble::textChanged() const
 {
     return impl->textChanged;
 }
+
+/*! Returns the thread which currently owns the text bubble. */
+Thread *TextBubble::owner() const
+{
+    return impl->owner;
+}

src/scratch/textbubble_p.h

@@ -11,6 +11,7 @@ struct TextBubblePrivate
 {
         TextBubble::Type type = TextBubble::Type::Say;
         std::string text;
+        Thread *owner = nullptr;
         mutable sigslot::signal<TextBubble::Type> typeChanged;
         mutable sigslot::signal<const std::string &> textChanged;
 };

test/scratch_classes/textbubble_test.cpp

@@ -1,4 +1,5 @@
 #include <scratchcpp/textbubble.h>
+#include <scratchcpp/thread.h>
 #include <enginemock.h>
 
 #include "../common.h"
@@ -33,16 +34,24 @@ TEST(TextBubbleTest, BubbleText)
 {
     TextBubble bubble;
     ASSERT_TRUE(bubble.text().empty());
+    ASSERT_EQ(bubble.owner(), nullptr);
 
     bubble.setText("hello");
     ASSERT_EQ(bubble.text(), "hello");
+    ASSERT_EQ(bubble.owner(), nullptr);
+
+    Thread thread(nullptr, nullptr, nullptr);
+    bubble.setText("test", &thread);
+    ASSERT_EQ(bubble.text(), "test");
+    ASSERT_EQ(bubble.owner(), &thread);
 
     EngineMock engine;
     bubble.setEngine(&engine);
     EXPECT_CALL(engine, moveDrawableToFront(&bubble));
     EXPECT_CALL(engine, requestRedraw());
     bubble.setText("world");
     ASSERT_EQ(bubble.text(), "world");
+    ASSERT_EQ(bubble.owner(), nullptr);
     bubble.setEngine(nullptr);
 
     // longstr.length = 384, should be limited to 330 in bubble text