From e47c0f56723a88fbc81bcac7f5392d24beb6a73e Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Tue, 4 Jan 2022 12:43:44 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-65358=20=E3=80=90=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E8=BE=B9=E6=A1=86=E3=80=91=E5=8D=95=E5=85=83=E6=A0=BC=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=8C=E7=BA=BF=E6=98=BE=E7=A4=BA=E6=9C=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

【改动思路】
同上
---
 .../fr/design/cell/CellStylePreviewPane.java  | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java b/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java
index b4b382af5..eb3c2cd7b 100644
--- a/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java
+++ b/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.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Rectangle;
 import java.awt.RenderingHints;
-import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.util.List;
 
@@ -154,16 +152,16 @@ public class CellStylePreviewPane extends JPanel {
         float adjustRight = 0;
         float adjustBottom = 0;
         if (column == 0) {
-            adjustLeft = GraphHelper.getLineStyleSize(style.getBorderLeft()) / 2.0F + computeOffset4DoubleStyleBorder(style);
+            adjustLeft = computeHalfSize4StyledBorder(style.getBorderLeft());
         }
         if (row == 0) {
-            adjustTop = GraphHelper.getLineStyleSize(style.getBorderTop()) / 2.0F + computeOffset4DoubleStyleBorder(style);
+            adjustTop = computeHalfSize4StyledBorder(style.getBorderTop());
         }
         if (column == columnSpan - 1) {
-            adjustRight = -GraphHelper.getLineStyleSize(style.getBorderRight()) / 2.0F - computeOffset4DoubleStyleBorder(style);
+            adjustRight = -computeHalfSize4StyledBorder(style.getBorderRight());
         }
         if (row == rowSpan - 1) {
-            adjustBottom = -GraphHelper.getLineStyleSize(style.getBorderBottom()) / 2.0F - computeOffset4DoubleStyleBorder(style);
+            adjustBottom = -computeHalfSize4StyledBorder(style.getBorderBottom());
         }
 
         g2d.translate(adjustLeft, adjustTop);
@@ -171,15 +169,16 @@ public class CellStylePreviewPane extends JPanel {
         g2d.translate(-adjustLeft, -adjustTop);
     }
 
-    private float computeOffset4DoubleStyleBorder(Style style) {
-        float offset = 0F;
-        if (style.getBorderLeft() == Constants.LINE_DOUBLE) {
-            offset += GraphHelper.getLineStyleSize(Constants.LINE_THIN) / 2.0F;
-        } else if (style.getBorderLeft() == Constants.LINE_DOUBLE_DOT) {
-            offset += GraphHelper.getLineStyleSize(Constants.LINE_DOT) / 2.0F;
+    private float computeHalfSize4StyledBorder(int border) {
+        float size = GraphHelper.getLineStyleSize(border) / 2.0F;
+
+        if (border == Constants.LINE_DOUBLE) {
+            size += GraphHelper.getLineStyleSize(Constants.LINE_THIN) / 2.0F;
+        } else if (border == Constants.LINE_DOUBLE_DOT) {
+            size += GraphHelper.getLineStyleSize(Constants.LINE_DOT) / 2.0F;
         }
 
-        return offset;
+        return size;
     }
 
     @Override