Browse Source

REPORT-65358 【主题边框】单元格样式双线显示有问题

【问题原因】
各边框绘制时的偏移距离要单独计算

【改动思路】
同上
new-design
Starryi 3 years ago
parent
commit
e47c0f5672
  1. 25
      designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java

25
designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java

@ -19,9 +19,7 @@ import java.awt.Font;
import java.awt.FontMetrics; import java.awt.FontMetrics;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.RenderingHints; import java.awt.RenderingHints;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.List; import java.util.List;
@ -154,16 +152,16 @@ public class CellStylePreviewPane extends JPanel {
float adjustRight = 0; float adjustRight = 0;
float adjustBottom = 0; float adjustBottom = 0;
if (column == 0) { if (column == 0) {
adjustLeft = GraphHelper.getLineStyleSize(style.getBorderLeft()) / 2.0F + computeOffset4DoubleStyleBorder(style); adjustLeft = computeHalfSize4StyledBorder(style.getBorderLeft());
} }
if (row == 0) { if (row == 0) {
adjustTop = GraphHelper.getLineStyleSize(style.getBorderTop()) / 2.0F + computeOffset4DoubleStyleBorder(style); adjustTop = computeHalfSize4StyledBorder(style.getBorderTop());
} }
if (column == columnSpan - 1) { if (column == columnSpan - 1) {
adjustRight = -GraphHelper.getLineStyleSize(style.getBorderRight()) / 2.0F - computeOffset4DoubleStyleBorder(style); adjustRight = -computeHalfSize4StyledBorder(style.getBorderRight());
} }
if (row == rowSpan - 1) { if (row == rowSpan - 1) {
adjustBottom = -GraphHelper.getLineStyleSize(style.getBorderBottom()) / 2.0F - computeOffset4DoubleStyleBorder(style); adjustBottom = -computeHalfSize4StyledBorder(style.getBorderBottom());
} }
g2d.translate(adjustLeft, adjustTop); g2d.translate(adjustLeft, adjustTop);
@ -171,15 +169,16 @@ public class CellStylePreviewPane extends JPanel {
g2d.translate(-adjustLeft, -adjustTop); g2d.translate(-adjustLeft, -adjustTop);
} }
private float computeOffset4DoubleStyleBorder(Style style) { private float computeHalfSize4StyledBorder(int border) {
float offset = 0F; float size = GraphHelper.getLineStyleSize(border) / 2.0F;
if (style.getBorderLeft() == Constants.LINE_DOUBLE) {
offset += GraphHelper.getLineStyleSize(Constants.LINE_THIN) / 2.0F; if (border == Constants.LINE_DOUBLE) {
} else if (style.getBorderLeft() == Constants.LINE_DOUBLE_DOT) { size += GraphHelper.getLineStyleSize(Constants.LINE_THIN) / 2.0F;
offset += GraphHelper.getLineStyleSize(Constants.LINE_DOT) / 2.0F; } else if (border == Constants.LINE_DOUBLE_DOT) {
size += GraphHelper.getLineStyleSize(Constants.LINE_DOT) / 2.0F;
} }
return offset; return size;
} }
@Override @Override

Loading…
Cancel
Save