Add bubbleLayer property to SpriteModel

Author: adazem009

src/spritemodel.cpp

@@ -261,4 +261,9 @@ const QString &SpriteModel::bubbleText() const
     return m_bubbleText;
 }
 
+int SpriteModel::bubbleLayer() const
+{
+    return m_sprite ? m_sprite->bubble()->layerOrder() : 0;
+}
+
 } // namespace scratchcpprender

src/spritemodel.h

@@ -28,6 +28,7 @@ class SpriteModel
         Q_PROPERTY(IPenLayer *penLayer READ penLayer WRITE setPenLayer NOTIFY penLayerChanged)
         Q_PROPERTY(TextBubbleShape::Type bubbleType READ bubbleType NOTIFY bubbleTypeChanged)
         Q_PROPERTY(QString bubbleText READ bubbleText NOTIFY bubbleTextChanged)
+        Q_PROPERTY(int bubbleLayer READ bubbleLayer NOTIFY bubbleLayerChanged)
 
     public:
         SpriteModel(QObject *parent = nullptr);
@@ -82,13 +83,16 @@ class SpriteModel
 
         const QString &bubbleText() const;
 
+        int bubbleLayer() const;
+
     signals:
         void renderedTargetChanged();
         void penLayerChanged();
         void bubbleTypeChanged();
         void bubbleTextChanged();
         void cloned(SpriteModel *cloneModel);
         void cloneDeleted(SpriteModel *clone);
+        void bubbleLayerChanged();
 
     private:
         libscratchcpp::Sprite *m_sprite = nullptr;

test/target_models/spritemodel_test.cpp

@@ -466,3 +466,15 @@ TEST(SpriteModelTest, PenDown)
     ASSERT_FALSE(model.penDown());
     ASSERT_FALSE(model.penState().penDown);
 }
+
+TEST(SpriteModelTest, BubbleLayer)
+{
+    SpriteModel model;
+    Sprite sprite;
+    model.init(&sprite);
+    QSignalSpy spy(&model, &SpriteModel::bubbleLayerChanged);
+
+    sprite.bubble()->setLayerOrder(5);
+    ASSERT_EQ(model.bubbleLayer(), 5);
+    // TODO: Use spy here
+}