RenderedTarget: Exclude the target from touching candidates

Author: adazem009

src/renderedtarget.cpp

@@ -804,7 +804,7 @@ QRectF RenderedTarget::touchingBounds() const
     return bounds;
 }
 
-QRectF RenderedTarget::candidatesBounds(const QRectF &targetRect, const std::vector<Target *> &candidates, std::vector<IRenderedTarget *> &dst)
+QRectF RenderedTarget::candidatesBounds(const QRectF &targetRect, const std::vector<Target *> &candidates, std::vector<IRenderedTarget *> &dst) const
 {
     QRectF united;
     dst.clear();
@@ -833,16 +833,18 @@ QRectF RenderedTarget::candidatesBounds(const QRectF &targetRect, const std::vec
                 target = model->renderedTarget();
         }
 
-        united = united.united(candidateIntersection(targetRect, target));
+        Q_ASSERT(target);
 
-        if (target)
+        if (target && target != this) {
+            united = united.united(candidateIntersection(targetRect, target));
             dst.push_back(target);
+        }
     }
 
     return united;
 }
 
-QRectF RenderedTarget::candidatesBounds(const QRectF &targetRect, const std::vector<libscratchcpp::Sprite *> &candidates, std::vector<IRenderedTarget *> &dst)
+QRectF RenderedTarget::candidatesBounds(const QRectF &targetRect, const std::vector<libscratchcpp::Sprite *> &candidates, std::vector<IRenderedTarget *> &dst) const
 {
     QRectF united;
     dst.clear();
@@ -860,10 +862,12 @@ QRectF RenderedTarget::candidatesBounds(const QRectF &targetRect, const std::vec
         if (model)
             target = model->renderedTarget();
 
-        united = united.united(candidateIntersection(targetRect, target));
+        Q_ASSERT(target);
 
-        if (target)
+        if (target && target != this) {
+            united = united.united(candidateIntersection(targetRect, target));
             dst.push_back(target);
+        }
     }
 
     return united;

src/renderedtarget.h

@@ -125,8 +125,8 @@ class RenderedTarget : public IRenderedTarget
         QPointF mapFromScratchToLocal(const QPointF &point) const;
         CpuTextureManager *textureManager();
         QRectF touchingBounds() const;
-        static QRectF candidatesBounds(const QRectF &targetRect, const std::vector<libscratchcpp::Target *> &candidates, std::vector<IRenderedTarget *> &dst);
-        static QRectF candidatesBounds(const QRectF &targetRect, const std::vector<libscratchcpp::Sprite *> &candidates, std::vector<IRenderedTarget *> &dst);
+        QRectF candidatesBounds(const QRectF &targetRect, const std::vector<libscratchcpp::Target *> &candidates, std::vector<IRenderedTarget *> &dst) const;
+        QRectF candidatesBounds(const QRectF &targetRect, const std::vector<libscratchcpp::Sprite *> &candidates, std::vector<IRenderedTarget *> &dst) const;
         static QRectF candidateIntersection(const QRectF &targetRect, IRenderedTarget *target);
         static void clampRect(libscratchcpp::Rect &rect, double left, double right, double bottom, double top);