Account for segment width in aActual calculation.

Fixes https://gitlab.com/kicad/code/kicad/issues/5990
2020-10-14 11:05:23 +01:00 · 2020-10-14 11:05:23 +01:00 · 54dc91a623
parent 12d21e34e2
commit 54dc91a623
1 changed files with 3 additions and 0 deletions
--- a/libs/kimath/src/geometry/shape_collisions.cpp
+++ b/libs/kimath/src/geometry/shape_collisions.cpp
@ -247,6 +247,9 @@ static inline bool Collide( const SHAPE_CIRCLE& aA, const SHAPE_SEGMENT& aSeg, i
        if( aMTV )
            *aMTV = -pushoutForce( aA, aSeg.GetSeg(), aClearance + aSeg.GetWidth() / 2);

+        if( aActual )
+            *aActual = std::max( 0, *aActual - aSeg.GetWidth() / 2 );
+
        return true;
    }