octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-12-23 03:19:06 +00:00
Code Issues Releases Wiki Activity

Merge pull request #735 from matthew16550/fix-folder-width

Browse Source 
Fix folder width growing with length of alias (#476)
This commit is contained in:
arnaudroques 2021-10-31 10:18:35 +01:00 committed by GitHub
commit 8f7e2f787d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/net/sourceforge/plantuml/graphic/USymbolFolder.java
View File

@ -147,8 +147,7 @@ public class USymbolFolder extends USymbol {
final Dimension2D dim = calculateDimension(ug.getStringBounder());
ug = UGraphicStencil.create(ug, dim);
ug = symbolContext.apply(ug);
final Dimension2D dimName = showTitle ? name.calculateDimension(ug.getStringBounder())
: new Dimension2DDouble(40, 15);
final Dimension2D dimName = getDimName(ug.getStringBounder());
drawFolder(ug, dim.getWidth(), dim.getHeight(), dimName, symbolContext.isShadowing(),
symbolContext.getRoundCorner());
final Margin margin = getMargin();
@ -159,8 +158,12 @@ public class USymbolFolder extends USymbol {
tb.drawU(ug.apply(new UTranslate(margin.getX1(), margin.getY1() + dimName.getHeight())));
}
private Dimension2D getDimName(StringBounder stringBounder) {
return showTitle ? name.calculateDimension(stringBounder) : new Dimension2DDouble(40, 15);
}
public Dimension2D calculateDimension(StringBounder stringBounder) {
final Dimension2D dimName = name.calculateDimension(stringBounder);
final Dimension2D dimName = getDimName(stringBounder);
final Dimension2D dimLabel = label.calculateDimension(stringBounder);
final Dimension2D dimStereo = stereotype.calculateDimension(stringBounder);
return getMargin().addDimension(Dimension2DDouble.mergeTB(dimName, dimStereo, dimLabel));
@ -195,4 +198,4 @@ public class USymbolFolder extends USymbol {
};
}
}
}