Add stageScale property to RenderedTarget

Author: adazem009

ScratchCPPGui/irenderedtarget.h

@@ -51,6 +51,9 @@ class IRenderedTarget : public QNanoQuickItem
         virtual SceneMouseArea *mouseArea() const = 0;
         virtual void setMouseArea(SceneMouseArea *newMouseArea) = 0;
 
+        virtual double stageScale() const = 0;
+        virtual void setStageScale(double scale) = 0;
+
         virtual qreal width() const = 0;
         virtual void setWidth(qreal width) = 0;
 

ScratchCPPGui/renderedtarget.cpp

@@ -213,6 +213,21 @@ void RenderedTarget::setMouseArea(SceneMouseArea *newMouseArea)
     emit mouseAreaChanged();
 }
 
+double RenderedTarget::stageScale() const
+{
+    return m_stageScale;
+}
+
+void RenderedTarget::setStageScale(double newStageScale)
+{
+    if (qFuzzyCompare(m_stageScale, newStageScale))
+        return;
+
+    m_stageScale = newStageScale;
+    Q_ASSERT(m_stageScale > 0);
+    emit stageScaleChanged();
+}
+
 qreal RenderedTarget::width() const
 {
     return QNanoQuickItem::width();

ScratchCPPGui/renderedtarget.h

@@ -25,6 +25,7 @@ class RenderedTarget : public IRenderedTarget
         Q_PROPERTY(SpriteModel *spriteModel READ spriteModel WRITE setSpriteModel NOTIFY spriteModelChanged)
         Q_PROPERTY(bool mirrorHorizontally READ mirrorHorizontally NOTIFY mirrorHorizontallyChanged)
         Q_PROPERTY(SceneMouseArea *mouseArea READ mouseArea WRITE setMouseArea NOTIFY mouseAreaChanged)
+        Q_PROPERTY(double stageScale READ stageScale WRITE setStageScale NOTIFY stageScaleChanged)
 
     public:
         RenderedTarget(QNanoQuickItem *parent = nullptr);
@@ -47,6 +48,9 @@ class RenderedTarget : public IRenderedTarget
         SceneMouseArea *mouseArea() const override;
         void setMouseArea(SceneMouseArea *newMouseArea) override;
 
+        double stageScale() const override;
+        void setStageScale(double newStageScale) override;
+
         qreal width() const override;
         void setWidth(qreal width) override;
 
@@ -77,6 +81,7 @@ class RenderedTarget : public IRenderedTarget
         void spriteModelChanged();
         void mouseAreaChanged();
         void mirrorHorizontallyChanged();
+        void stageScaleChanged();
 
     protected:
         QNanoQuickItemPainter *createItemPainter() const override;
@@ -116,6 +121,7 @@ class RenderedTarget : public IRenderedTarget
         bool m_newMirrorHorizontally = false;
         double m_originX = 0;
         double m_originY = 0;
+        double m_stageScale = 1;
         qreal m_maximumWidth = std::numeric_limits<double>::infinity();
         qreal m_maximumHeight = std::numeric_limits<double>::infinity();
         std::vector<QPointF> m_hullPoints;

test/mocks/renderedtargetmock.h

@@ -30,6 +30,9 @@ class RenderedTargetMock : public IRenderedTarget
         MOCK_METHOD(SceneMouseArea *, mouseArea, (), (const, override));
         MOCK_METHOD(void, setMouseArea, (SceneMouseArea *), (override));
 
+        MOCK_METHOD(double, stageScale, (), (const, override));
+        MOCK_METHOD(void, setStageScale, (double), (override));
+
         MOCK_METHOD(qreal, width, (), (const, override));
         MOCK_METHOD(void, setWidth, (qreal), (override));
 

test/renderedtarget/renderedtarget_test.cpp

@@ -603,3 +603,12 @@ TEST_F(RenderedTargetTest, MouseArea)
     target.setMouseArea(&mouseArea);
     ASSERT_EQ(target.mouseArea(), &mouseArea);
 }
+
+TEST_F(RenderedTargetTest, StageScale)
+{
+    RenderedTarget target;
+    ASSERT_EQ(target.stageScale(), 1);
+
+    target.setStageScale(6.4);
+    ASSERT_EQ(target.stageScale(), 6.4);
+}