Add bubbleLayer property to StageModel

scratchcpp · Sep 24, 2024 · 756d2e6 · 756d2e6
1 parent 17b3883
commit 756d2e6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/src/stagemodel.cpp b/src/stagemodel.cpp
@@ -154,3 +154,8 @@ const QString &StageModel::bubbleText() const
 {
     return m_bubbleText;
 }
+
+int StageModel::bubbleLayer() const
+{
+    return m_stage ? m_stage->bubble()->layerOrder() : 0;
+}
diff --git a/src/stagemodel.h b/src/stagemodel.h
@@ -22,6 +22,7 @@ class StageModel
         Q_PROPERTY(IRenderedTarget *renderedTarget READ renderedTarget WRITE setRenderedTarget NOTIFY renderedTargetChanged)
         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:
         explicit StageModel(QObject *parent = nullptr);
@@ -59,10 +60,13 @@ class StageModel
 
         const QString &bubbleText() const;
 
+        int bubbleLayer() const;
+
     signals:
         void renderedTargetChanged();
         void bubbleTypeChanged();
         void bubbleTextChanged();
+        void bubbleLayerChanged();
 
     private:
         libscratchcpp::Stage *m_stage = nullptr;

diff --git a/test/target_models/stagemodel_test.cpp b/test/target_models/stagemodel_test.cpp
@@ -225,3 +225,15 @@ TEST(StageModelTest, RenderedTarget)
     stage.setCostumeIndex(2);
     model.loadCostume();
 }
+
+TEST(StageModelTest, BubbleLayer)
+{
+    StageModel model;
+    Stage stage;
+    model.init(&stage);
+    QSignalSpy spy(&model, &StageModel::bubbleLayerChanged);
+
+    stage.bubble()->setLayerOrder(5);
+    ASSERT_EQ(model.bubbleLayer(), 5);
+    // TODO: Use spy here
+}