Add getBoundsForBubble() method to IRenderedTarget

Author: adazem009

src/irenderedtarget.h

@@ -70,6 +70,7 @@ class IRenderedTarget : public QNanoQuickItem
         virtual void setHeight(qreal width) = 0;
 
         virtual libscratchcpp::Rect getBounds() const = 0;
+        virtual QRectF getBoundsForBubble() const = 0;
 
         virtual QPointF mapFromScene(const QPointF &point) const = 0;
 

src/renderedtarget.cpp

@@ -366,6 +366,19 @@ Rect RenderedTarget::getBounds() const
     return Rect(left + m_x, top + m_y, right + m_x, bottom + m_y);
 }
 
+QRectF RenderedTarget::getBoundsForBubble() const
+{
+    // https://github.com/scratchfoundation/scratch-render/blob/86dcb0151a04bc8c1ff39559e8531e7921102b56/src/Drawable.js#L536-L551
+    Rect rect = getBounds();
+    const int slice = 8; // px, how tall the top slice to measure should be
+
+    if (rect.height() > slice)
+        rect.setBottom(rect.top() - slice);
+
+    Q_ASSERT(rect.height() <= 8);
+    return QRectF(QPointF(rect.left(), rect.top()), QPointF(rect.right(), rect.bottom()));
+}
+
 QPointF RenderedTarget::mapFromScene(const QPointF &point) const
 {
     return QNanoQuickItem::mapFromScene(point);

src/renderedtarget.h

@@ -75,6 +75,7 @@ class RenderedTarget : public IRenderedTarget
         void setHeight(qreal height) override;
 
         libscratchcpp::Rect getBounds() const override;
+        Q_INVOKABLE QRectF getBoundsForBubble() const override;
 
         QPointF mapFromScene(const QPointF &point) const override;
 

test/mocks/renderedtargetmock.h

@@ -56,6 +56,7 @@ class RenderedTargetMock : public IRenderedTarget
         MOCK_METHOD(QPointF, mapFromScene, (const QPointF &), (const, override));
 
         MOCK_METHOD(libscratchcpp::Rect, getBounds, (), (const, override));
+        MOCK_METHOD(QRectF, getBoundsForBubble, (), (const, override));
 
         MOCK_METHOD(bool, mirrorHorizontally, (), (const, override));
 

test/renderedtarget/renderedtarget_test.cpp

@@ -674,6 +674,12 @@ TEST_F(RenderedTargetTest, GetBounds)
     ASSERT_EQ(std::round(bounds.right() * 100) / 100, 66.72);
     ASSERT_EQ(std::round(bounds.bottom() * 100) / 100, -125.11);
 
+    QRectF bubbleBounds = target.getBoundsForBubble();
+    ASSERT_EQ(std::round(bubbleBounds.left() * 100) / 100, 66.13);
+    ASSERT_EQ(std::round(bubbleBounds.top() * 100) / 100, -124.52);
+    ASSERT_EQ(std::round(bubbleBounds.right() * 100) / 100, 66.72);
+    ASSERT_EQ(std::round(bubbleBounds.bottom() * 100) / 100, -125.11);
+
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     target.updateRotationStyle(Sprite::RotationStyle::LeftRight);
@@ -684,6 +690,12 @@ TEST_F(RenderedTargetTest, GetBounds)
     ASSERT_EQ(std::round(bounds.right() * 100) / 100, 72.29);
     ASSERT_EQ(std::round(bounds.bottom() * 100) / 100, -110.89);
 
+    bubbleBounds = target.getBoundsForBubble();
+    ASSERT_EQ(std::round(bubbleBounds.left() * 100) / 100, 71.87);
+    ASSERT_EQ(std::round(bubbleBounds.top() * 100) / 100, -110.47);
+    ASSERT_EQ(std::round(bubbleBounds.right() * 100) / 100, 72.29);
+    ASSERT_EQ(std::round(bubbleBounds.bottom() * 100) / 100, -110.89);
+
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     target.setStageScale(20.75);
@@ -694,5 +706,27 @@ TEST_F(RenderedTargetTest, GetBounds)
     ASSERT_EQ(std::round(bounds.right() * 100) / 100, 72.29);
     ASSERT_EQ(std::round(bounds.bottom() * 100) / 100, -110.89);
 
+    bubbleBounds = target.getBoundsForBubble();
+    ASSERT_EQ(std::round(bubbleBounds.left() * 100) / 100, 71.87);
+    ASSERT_EQ(std::round(bubbleBounds.top() * 100) / 100, -110.47);
+    ASSERT_EQ(std::round(bubbleBounds.right() * 100) / 100, 72.29);
+    ASSERT_EQ(std::round(bubbleBounds.bottom() * 100) / 100, -110.89);
+
+    EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
+    EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
+    target.updateSize(9780.6);
+
+    bounds = target.getBounds();
+    ASSERT_EQ(std::round(bounds.left() * 100) / 100, -466.05);
+    ASSERT_EQ(std::round(bounds.top() * 100) / 100, 1294.13);
+    ASSERT_EQ(std::round(bounds.right() * 100) / 100, -405.87);
+    ASSERT_EQ(std::round(bounds.bottom() * 100) / 100, 1233.94);
+
+    bubbleBounds = target.getBoundsForBubble();
+    ASSERT_EQ(std::round(bubbleBounds.left() * 100) / 100, -466.05);
+    ASSERT_EQ(std::round(bubbleBounds.top() * 100) / 100, 1294.13);
+    ASSERT_EQ(std::round(bubbleBounds.right() * 100) / 100, -405.87);
+    ASSERT_EQ(std::round(bubbleBounds.bottom() * 100) / 100, 1286.13);
+
     context.doneCurrent();
 }