git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1716947 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2015-11-28 11:53:22 +00:00
parent 1f05c1916a
commit 47dc6340c2

View File

@ -164,8 +164,19 @@ public class SheetUtil {
return width; return width;
} }
/**
* Calculate the best-fit width for a cell
* If a merged cell spans multiple columns, evenly distribute the column width among those columns
*
* @param defaultCharWidth the width of a character using the default font in a workbook
* @param colspan the number of columns that is spanned by the cell (1 if the cell is not part of a merged region)
* @param style the cell style, which contains text rotation and indention information needed to compute the cell width
* @param width the minimum best-fit width. This algorithm will only return values greater than or equal to the minimum width.
* @param str the text contained in the cell
* @return
*/
private static double getCellWidth(int defaultCharWidth, int colspan, private static double getCellWidth(int defaultCharWidth, int colspan,
CellStyle style, double width, AttributedString str) { CellStyle style, double minWidth, AttributedString str) {
TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext); TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
final Rectangle2D bounds; final Rectangle2D bounds;
if(style.getRotation() != 0){ if(style.getRotation() != 0){
@ -184,9 +195,9 @@ public class SheetUtil {
} else { } else {
bounds = layout.getBounds(); bounds = layout.getBounds();
} }
// entireWidth accounts for leading spaces which is excluded from bounds.getWidth() // frameWidth accounts for leading spaces which is excluded from bounds.getWidth()
final double frameWidth = bounds.getX() + bounds.getWidth(); final double frameWidth = bounds.getX() + bounds.getWidth();
width = Math.max(width, ((frameWidth / colspan) / defaultCharWidth) + style.getIndention()); final double width = Math.max(minWidth, ((frameWidth / colspan) / defaultCharWidth) + style.getIndention());
return width; return width;
} }