Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2014-05-19 07:52:51 +0000
committerAnsgar Radermacher2014-05-19 07:53:51 +0000
commitc1d4f38b6456c4a5f52c5b32d4338208ea92568d (patch)
tree5ecbfcace3238d260e9a3f58c7a173fa0d506b15 /plugins
parentbe5203dafd8e1b53a9dee4b68a072242b8293ac3 (diff)
downloadorg.eclipse.papyrus-c1d4f38b6456c4a5f52c5b32d4338208ea92568d.tar.gz
org.eclipse.papyrus-c1d4f38b6456c4a5f52c5b32d4338208ea92568d.tar.xz
org.eclipse.papyrus-c1d4f38b6456c4a5f52c5b32d4338208ea92568d.zip
401542 - [All Diagrams] Removed labels remain as invisible elements in diagram and lead to confusing selections
Diffstat (limited to 'plugins')
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend11
1 files changed, 9 insertions, 2 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend
index 3611b91cce3..13c6e7f1080 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend
@@ -567,8 +567,15 @@ override refreshLabel(GenCommonBase it , GenDiagram diagram )'''
protected void refreshLabel() {
org.eclipse.gef.EditPolicy maskLabelPolicy = getEditPolicy(org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
if (maskLabelPolicy == null) {
- setLabelTextHelper(getFigure(), getLabelText());
- setLabelIconHelper(getFigure(), getLabelIcon());
+ View view = (View)getModel();
+ if(view.isVisible()) {
+ setLabelTextHelper(getFigure(), getLabelText());
+ setLabelIconHelper(getFigure(), getLabelIcon());
+ }
+ else {
+ setLabelTextHelper(getFigure(), "");
+ setLabelIconHelper(getFigure(), null);
+ }
}
Object pdEditPolicy = getEditPolicy(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE);
if (pdEditPolicy instanceof źdiagram.getTextSelectionEditPolicyQualifiedClassName()╗) {

Back to the top