Skip to content

Commit 45c4c66

Browse files
committed
Add bubbleLayer property to StageModel
1 parent 49764d8 commit 45c4c66

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

src/stagemodel.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,8 @@ const QString &StageModel::bubbleText() const
154154
{
155155
return m_bubbleText;
156156
}
157+
158+
int StageModel::bubbleLayer() const
159+
{
160+
return m_stage ? m_stage->bubble()->layerOrder() : 0;
161+
}

src/stagemodel.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class StageModel
2222
Q_PROPERTY(IRenderedTarget *renderedTarget READ renderedTarget WRITE setRenderedTarget NOTIFY renderedTargetChanged)
2323
Q_PROPERTY(TextBubbleShape::Type bubbleType READ bubbleType NOTIFY bubbleTypeChanged)
2424
Q_PROPERTY(QString bubbleText READ bubbleText NOTIFY bubbleTextChanged)
25+
Q_PROPERTY(int bubbleLayer READ bubbleLayer NOTIFY bubbleLayerChanged)
2526

2627
public:
2728
explicit StageModel(QObject *parent = nullptr);
@@ -59,10 +60,13 @@ class StageModel
5960

6061
const QString &bubbleText() const;
6162

63+
int bubbleLayer() const;
64+
6265
signals:
6366
void renderedTargetChanged();
6467
void bubbleTypeChanged();
6568
void bubbleTextChanged();
69+
void bubbleLayerChanged();
6670

6771
private:
6872
libscratchcpp::Stage *m_stage = nullptr;

test/target_models/stagemodel_test.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,3 +225,15 @@ TEST(StageModelTest, RenderedTarget)
225225
stage.setCostumeIndex(2);
226226
model.loadCostume();
227227
}
228+
229+
TEST(StageModelTest, BubbleLayer)
230+
{
231+
StageModel model;
232+
Stage stage;
233+
model.init(&stage);
234+
QSignalSpy spy(&model, &StageModel::bubbleLayerChanged);
235+
236+
stage.bubble()->setLayerOrder(5);
237+
ASSERT_EQ(model.bubbleLayer(), 5);
238+
// TODO: Use spy here
239+
}

0 commit comments

Comments
 (0)