(In reply to Oliver Kellogg from comment #26)

> > [...]
> > On moving class_with_tmplt around, much too strong preference is given to
> > the template box.
>
> FYI I found the fix for this.
> Will take a few days until I can commit.

Here we go:

umbrello/widgets/associationwidget.cpp function updateRegionLineCount()
- In the non angular case, apply QPainterPath::toSubpathPolygons() on
  pWidget{A,B}->shape() instead of toFillPolygon(), and form a single
  poly{A,B} from the polyList{A,B} returned by toSubpathPolygons() by
  uniting together the subpath polygons using QPolygonF::united().

umbrello/widgets/widget_utils.cpp
- In functions prevPoint() and nextPoint() add consideration of
  poly.isClosed() for calculating the index of the result point.
- New function findLine() factors code common to regions North, South,
  West, and East from function closestPoints().
- In function closestPoints(),
  - Remove obsolete local variables;
  - Reduce local variables otherPoint{1,2} to otherPoint and selfPoint{1,2}
    to selfPoint;
  - In regions North, South, West, and East, use new function findLine().

CCBUG:128351