commit 8cf405e179c068bd4c10ba98ae86834f45f9dd18
author Laurent Redor <laurent.redor@obeo.fr> Wed Oct 14 15:51:23 2020 +0200
committer Pierre-Charles David <pierre-charles.david@obeo.fr> Tue Sep 28 11:34:03 2021 -0400
tree 850f114073fbf0792c27a78a0bb3db6e2c26cf47
parent c453d151956af7b16383e97d5dd7ebd6bd69c16d

[567876] Fix wrong width computation for combined links

Bug: 567876
Change-Id: Idbdb5c72be0a82a53317fec3fa93188c148eb273
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java

diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java
index 16f3115..7d5d403 100644
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java
+++ b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java
@@ -35,7 +35,6 @@
 import org.eclipse.draw2d.geometry.PrecisionPoint;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg.KeyPoint;
 import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
 import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.ConnectionLayerEx;
 import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.DelegatingLayout;
@@ -1016,7 +1015,7 @@
                 } else {
                     if (pPrevJumpLink == null)
                         pPrevJumpLink = pLastJumpLink;
-                    nCurrentWidth += jumpLinkSize.width - (nDeltaMin - nDelta);
+                    nCurrentWidth += nDelta;
                 }
 
                 pLastJumpLink = pJumpLink;