Bug 535519: [Sequence Diagram] Sequence Diagram layout (& semantics) do

not support DPI scaling
https://bugs.eclipse.org/bugs/show_bug.cgi?id=535519

- Initial version: support a labelHeight / labelWidth in CSS
- Remove the layout tolerance from the tests

Change-Id: Ie46bb206c3046e6111ebaea2a7cc1f66ca09ea15
Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com>

1 files changed, 14 insertions, 0 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentEditPart.java
index 9b6764ef396..5126f2ab52d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentEditPart.java
@@ -21,6 +21,9 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gef.Request;
 import org.eclipse.gef.requests.ChangeBoundsRequest;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.NamedStyleProperties;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentResizeEditPolicy;
 import org.eclipse.uml2.uml.CombinedFragment;
 import org.eclipse.uml2.uml.ConsiderIgnoreFragment;
@@ -66,6 +69,7 @@ public class CCombinedFragmentEditPart extends CombinedFragmentEditPart {
 	protected void refreshVisuals() {
 		refreshLabel();
 		super.refreshVisuals();
+		refreshLabelSize();
 	}
 
 	/**
@@ -79,6 +83,16 @@ public class CCombinedFragmentEditPart extends CombinedFragmentEditPart {
 	}
 
 	/**
+	 * @since 5.1
+	 */
+	// Bug 535519
+	protected void refreshLabelSize() {
+		int labelWidth = NotationUtils.getIntValue(getNotationView(), NamedStyleProperties.LABEL_WIDTH, PapyrusWrappingLabel.AUTO_SIZE);
+		int labelHeight = NotationUtils.getIntValue(getNotationView(), NamedStyleProperties.LABEL_HEIGHT, PapyrusWrappingLabel.AUTO_SIZE);
+		getPrimaryShape().setLabelSize(labelWidth, labelHeight);
+	}
+
+	/**
 	 * @see org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart#createDefaultEditPolicies()
 	 *
 	 */