diff options
author | ptessier | 2014-04-04 12:06:49 +0000 |
---|---|---|
committer | ptessier | 2014-04-04 12:06:49 +0000 |
commit | 0296a41791f35a5091fea5c0d7cfe34c407128a7 (patch) | |
tree | 7242733eea2fdd24764cb27611fc7f1a4bc7fa9a /plugins | |
parent | aef55231325caccc23272c722d92263fa022f7e9 (diff) | |
download | org.eclipse.papyrus-0296a41791f35a5091fea5c0d7cfe34c407128a7.tar.gz org.eclipse.papyrus-0296a41791f35a5091fea5c0d7cfe34c407128a7.tar.xz org.eclipse.papyrus-0296a41791f35a5091fea5c0d7cfe34c407128a7.zip |
426878: Stereotype property text in compartment is partly obscured
https://bugs.eclipse.org/bugs/show_bug.cgi?id=426878
Diffstat (limited to 'plugins')
3 files changed, 7 insertions, 6 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/layout/PropertiesCompartmentLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/layout/PropertiesCompartmentLayoutManager.java index e961b4d4ead..aa5d2cc74ec 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/layout/PropertiesCompartmentLayoutManager.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/layout/PropertiesCompartmentLayoutManager.java @@ -37,8 +37,8 @@ public class PropertiesCompartmentLayoutManager extends AbstractLayout { for(int i = 0; i < container.getChildren().size(); i++) { IFigure fig=((IFigure)container.getChildren().get(i)); - if( container instanceof AppliedStereotypeCompartmentFigure){ - if(((AppliedStereotypeCompartmentFigure)container).isExpanded()){ + if( fig instanceof AppliedStereotypeCompartmentFigure){ + if(((AppliedStereotypeCompartmentFigure)fig).isExpanded()){ minimumHeight = minimumHeight + fig.getPreferredSize(hint, hint2).height + MARGIN_Y; minimumWith = Math.max(minimumWith, fig.getPreferredSize(hint, hint2).width); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java index 5e0f438e42d..ba9f611a3ad 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java @@ -175,7 +175,7 @@ public class AutomaticCompartmentLayoutManager extends AbstractLayout { ((WrappingLabel) child).setTextJustification(PositionConstants.CENTER); bound.setSize(child.getPreferredSize(container.width, -1)); } else { - bound.setSize(getPreferedSize(child)); + bound.setSize(getPreferedSize(child,container.width)); } if(previous != null) { bound.y = previous.getBounds().getBottomLeft().y + 1; @@ -204,12 +204,12 @@ public class AutomaticCompartmentLayoutManager extends AbstractLayout { * A figure that contains a GMF compartment * @return The figure's preferred size */ - private Dimension getPreferedSize(IFigure figure) { - Dimension dim = figure.getPreferredSize(); + private Dimension getPreferedSize(IFigure figure,int width) { + Dimension dim = figure.getPreferredSize(width, -1); if(!figure.getChildren().isEmpty()) { Object compartment = figure.getChildren().get(0); if(compartment instanceof ResizableCompartmentFigure) { - dim.height = ((ResizableCompartmentFigure)compartment).getPreferredSize().height + 10; + dim.height = ((ResizableCompartmentFigure)compartment).getPreferredSize(width,-1).height + 10; if(dim.height < MINIMUM_COMPARTMENT_HEIGHT) { dim.height = MINIMUM_COMPARTMENT_HEIGHT; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpart/AppliedStereotypeMultilinePropertyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpart/AppliedStereotypeMultilinePropertyEditPart.java index dc085fab9cb..0aea6de8328 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpart/AppliedStereotypeMultilinePropertyEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/src/org/eclipse/papyrus/uml/diagram/stereotype/edition/editpart/AppliedStereotypeMultilinePropertyEditPart.java @@ -16,6 +16,7 @@ package org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart; import java.util.Collections;
import java.util.List;
+import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
|