Skip to content

Commit

Permalink
[426] Use the font defined in the GMF node to compute label dimension
Browse files Browse the repository at this point in the history 
Bug: #426
  • Loading branch information
@lredor
lredor committed Sep 17, 2024
1 parent 0294b05 commit ae9308d
Showing 1 changed file with 32 additions and 19 deletions.
51 changes: 32 additions & 19 deletions ....sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/GMFHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Stream;

import org.eclipse.core.runtime.Path;
Expand All @@ -44,12 +45,14 @@
import org.eclipse.gmf.runtime.notation.Bounds;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.Edge;
import org.eclipse.gmf.runtime.notation.FontStyle;
import org.eclipse.gmf.runtime.notation.LayoutConstraint;
import org.eclipse.gmf.runtime.notation.Location;
import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
import org.eclipse.gmf.runtime.notation.Size;
import org.eclipse.gmf.runtime.notation.Style;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
import org.eclipse.jface.resource.ImageDescriptor;
Expand All @@ -73,6 +76,7 @@
import org.eclipse.sirius.diagram.ui.business.internal.query.DNodeContainerQuery;
import org.eclipse.sirius.diagram.ui.business.internal.query.DNodeQuery;
import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramElementContainerEditPart;
import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramNameEditPart;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.AbstractDNodeContainerCompartmentEditPart;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeContainer2EditPart;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeList2EditPart;
Expand Down Expand Up @@ -182,7 +186,7 @@ public static Dimension getTopLeftInsets(Node container) {
// RegionContainer do not have containers insets
if (ddec instanceof DNodeContainer) {
if (new DNodeContainerExperimentalQuery((DNodeContainer) ddec).isRegionContainer() || hasFullLabelBorder(ddec)) {
result.setHeight(CONTAINER_INSETS.top + getLabelSize(container) + AbstractDiagramElementContainerEditPart.DEFAULT_SPACING);
result.setHeight(CONTAINER_INSETS.top + getLabelDimension(container, new Dimension(50, 20)).width() + AbstractDiagramElementContainerEditPart.DEFAULT_SPACING);
} else {
result.setWidth(CONTAINER_INSETS.left);
result.setHeight(CONTAINER_INSETS.top);
Expand Down Expand Up @@ -338,23 +342,6 @@ private static boolean hasFullLabelBorder(DDiagramElementContainer ddec) {
return labelBorderStyle.some() && LabelBorderStyleIds.LABEL_FULL_BORDER_STYLE_FOR_CONTAINER_ID.equals(labelBorderStyle.get().getId());
}

private static int getLabelSize(Node parentNode) {
int labelSize = 0;
for (Node child : Iterables.filter(parentNode.getVisibleChildren(), Node.class)) {
if (new ViewQuery(child).isForNameEditPart()) {
// TODO Compute the real label height
// It depends on the font size
// It might require to set the layout constraint of the label
// GMF node which will not be used by the
// ConstrainedToolbarLayout to locate the label but might be
// usefull to store the value in the model.
labelSize = 16;
break;
}
}
return labelSize;
}

private static boolean isFirstRegion(DDiagramElementContainer ddec) {
EObject potentialRegionContainer = ddec.eContainer();
if (potentialRegionContainer instanceof DNodeContainer) {
Expand Down Expand Up @@ -1012,7 +999,16 @@ public static Dimension getLabelDimension(Node node, Dimension defaultDimension)
if (!new DDiagramElementQuery(dDiagramElement).isLabelHidden()) {
if (siriusStyle instanceof BasicLabelStyle) {
BasicLabelStyle bls = (BasicLabelStyle) siriusStyle;
Font defaultFont = VisualBindingManager.getDefault().getFontFromLabelStyle(bls, (String) viewQuery.getDefaultValue(NotationPackage.Literals.FONT_STYLE__FONT_NAME));
String fontName = (String) viewQuery.getDefaultValue(NotationPackage.Literals.FONT_STYLE__FONT_NAME);
Optional<Style> optionalStyle = getFontStyleOf(node);
if (optionalStyle.isPresent() && optionalStyle.get() instanceof FontStyle) {
String currentFontName = ((FontStyle) optionalStyle.get()).getFontName();
if (currentFontName != null && !currentFontName.isEmpty()) {
// Use the defined font name in the node if it is defined.
fontName = currentFontName;
}
}
Font defaultFont = VisualBindingManager.getDefault().getFontFromLabelStyle(bls, fontName);
try {
labelSize = FigureUtilities.getStringExtents(dDiagramElement.getName(), defaultFont);
if (bls.isShowIcon()) {
Expand All @@ -1032,6 +1028,23 @@ public static Dimension getLabelDimension(Node node, Dimension defaultDimension)
return labelSize;
}

/**
* Get the font style to use for this node. As in
* {@link org.eclipse.sirius.diagram.ui.edit.api.part.DiagramNameEditPartOperation#getFontStyle(IDiagramNameEditPart)},
* the parent style is used if no one is defined for the node.
*
* @param node
* The node to use
* @return The font style to use for this node
*/
private static Optional<Style> getFontStyleOf(Node node) {
Style style = node.getStyle(NotationPackage.eINSTANCE.getFontStyle());
if (style == null && node.eContainer() instanceof View container) {
style = container.getStyle(NotationPackage.eINSTANCE.getFontStyle());
}
return Optional.ofNullable(style);
}

private static Dimension getIconDimension(DSemanticDecorator dSemanticDecorator, BasicLabelStyle bls) {
ImageDescriptor descriptor = null;
EObject target = dSemanticDecorator.getTarget();
Expand Down

0 comments on commit ae9308d

Please sign in to comment.