Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Redor2019-04-30 09:50:40 +0000
committerLaurent Redor2019-08-07 13:50:02 +0000
commit9089cf41f3caf54c4664cf63a9597d4e2bb0a1ac (patch)
tree07e438b56475e6ff9f7e213ccfd73edbe95a99a8
parent11c4bc8aee56fd348295cd18bc5a69d2a7ee1b17 (diff)
downloadorg.eclipse.sirius-9089cf41f3caf54c4664cf63a9597d4e2bb0a1ac.tar.gz
org.eclipse.sirius-9089cf41f3caf54c4664cf63a9597d4e2bb0a1ac.tar.xz
org.eclipse.sirius-9089cf41f3caf54c4664cf63a9597d4e2bb0a1ac.zip
[548820] Convert Sirius diagram to ELK graph - Wrong edge label size
Bug: 548820 Change-Id: Iacfdab5434692afd811c64550e5aa3217b1e253b Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java b/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java
index 0a54db7e2e..ed47df63f7 100644
--- a/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java
+++ b/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java
@@ -1204,11 +1204,8 @@ public class ElkDiagramLayoutConnector implements IDiagramLayoutConnector {
label.setProperty(CoreOptions.FONT_SIZE, font.getFontData()[0].getHeight());
}
label.setLocation(labelBounds.x - offset.x, labelBounds.y - offset.y);
- if (iconBounds != null) {
- label.setWidth(labelBounds.width + iconBounds.width);
- } else {
- label.setWidth(labelBounds.width);
- }
+ // The label width includes the icon width
+ label.setWidth(labelBounds.width);
label.setHeight(labelBounds.height);
// We would set the modified flag to false here, but that

Back to the top