Notify about bubble layer changes

Resolves: #148

Author: adazem009

src/spritemodel.cpp

@@ -23,7 +23,9 @@ void SpriteModel::init(libscratchcpp::Sprite *sprite)
     m_sprite = sprite;
 
     if (m_sprite) {
-        m_sprite->bubble()->typeChanged().connect([this](libscratchcpp::TextBubble::Type type) {
+        libscratchcpp::TextBubble *bubble = m_sprite->bubble();
+
+        bubble->typeChanged().connect([this](libscratchcpp::TextBubble::Type type) {
             if (type == libscratchcpp::TextBubble::Type::Say) {
                 if (m_bubbleType == TextBubbleShape::Type::Say)
                     return;
@@ -39,14 +41,16 @@ void SpriteModel::init(libscratchcpp::Sprite *sprite)
             emit bubbleTypeChanged();
         });
 
-        m_sprite->bubble()->textChanged().connect([this](const std::string &text) {
+        bubble->textChanged().connect([this](const std::string &text) {
             QString newText = QString::fromStdString(text);
 
             if (m_bubbleText != newText) {
                 m_bubbleText = newText;
                 emit bubbleTextChanged();
             }
         });
+
+        bubble->layerOrderChanged().connect([this](int) { emit bubbleLayerChanged(); });
     }
 }
 

src/stagemodel.cpp

@@ -19,7 +19,9 @@ void StageModel::init(libscratchcpp::Stage *stage)
     m_stage = stage;
 
     if (m_stage) {
-        m_stage->bubble()->typeChanged().connect([this](libscratchcpp::TextBubble::Type type) {
+        libscratchcpp::TextBubble *bubble = m_stage->bubble();
+
+        bubble->typeChanged().connect([this](libscratchcpp::TextBubble::Type type) {
             if (type == libscratchcpp::TextBubble::Type::Say) {
                 if (m_bubbleType == TextBubbleShape::Type::Say)
                     return;
@@ -35,14 +37,16 @@ void StageModel::init(libscratchcpp::Stage *stage)
             emit bubbleTypeChanged();
         });
 
-        m_stage->bubble()->textChanged().connect([this](const std::string &text) {
+        bubble->textChanged().connect([this](const std::string &text) {
             QString newText = QString::fromStdString(text);
 
             if (m_bubbleText != newText) {
                 m_bubbleText = newText;
                 emit bubbleTextChanged();
             }
         });
+
+        bubble->layerOrderChanged().connect([this](int) { emit bubbleLayerChanged(); });
     }
 }
 

test/target_models/spritemodel_test.cpp

@@ -476,5 +476,5 @@ TEST(SpriteModelTest, BubbleLayer)
 
     sprite.bubble()->setLayerOrder(5);
     ASSERT_EQ(model.bubbleLayer(), 5);
-    // TODO: Use spy here
+    ASSERT_EQ(spy.count(), 1);
 }

test/target_models/stagemodel_test.cpp

@@ -235,5 +235,5 @@ TEST(StageModelTest, BubbleLayer)
 
     stage.bubble()->setLayerOrder(5);
     ASSERT_EQ(model.bubbleLayer(), 5);
-    // TODO: Use spy here
+    ASSERT_EQ(spy.count(), 1);
 }