Correct clipping issue. clipPath must never be empty.

basysKom · Nov 1, 2023 · 743bba5 · 743bba5
1 parent 3a821e5
commit 743bba5
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/RiveQtQuickItem/riveqtpath.cpp b/src/RiveQtQuickItem/riveqtpath.cpp
@@ -138,9 +138,14 @@ QVector<QVector<QVector2D>> RiveQtPath::toVertices()
 void RiveQtPath::intersectWith(const QPainterPath &other)
 {
     if (!m_qPainterPath.isEmpty()) {
-        m_qPainterPath = m_qPainterPath.intersected(other);
-        m_pathSegmentDataDirty = true;
-        m_pathSegmentOutlineDataDirty = true;
+        if (m_qPainterPath.intersects(other)) {
+            QPainterPath tempQPainterPath = m_qPainterPath.intersected(other);
+            if (!tempQPainterPath.isEmpty()) {
+                m_qPainterPath = tempQPainterPath;
+                m_pathSegmentDataDirty = true;
+                m_pathSegmentOutlineDataDirty = true;
+            }
+        }
     }
 }
 
@@ -188,7 +193,6 @@ std::optional<QVector2D> calculateIntersection(const QVector2D &p1, const QVecto
     return QVector2D(intersectX, intersectY);
 }
 
-
 QPointF RiveQtPath::cubicBezier(const QPointF &startPoint, const QPointF &controlPoint1, const QPointF &controlPoint2,
                                 const QPointF &endPoint, qreal t)
 {