From 7d78a0e66cadda5c89e9303a041c861128a1561d Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Fri, 24 Dec 2021 14:46:10 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-64655=20=E3=80=90=E8=A7=86=E8=A7=89?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=E3=80=91=E6=A8=A1=E6=9D=BF=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
修改主题单元格样式编辑中的外边距

【改动思路】
同上
---
 .../theme/edit/cell/CellStyleEditPane.java    | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java
index 6c63953509..f599500486 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java
@@ -137,9 +137,6 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
     protected void initLayout() {
         this.setLayout(new BorderLayout(0, 10));
 
-        JPanel jPanel = new JPanel();
-        jPanel.setLayout(new BorderLayout(0, 4));
-
         JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         previewArea = new CellRectangleStylePreviewPane(true);
         previewArea.setPreferredSize(new Dimension(215, 48));
@@ -150,8 +147,13 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
 
         this.add(previewPane, BorderLayout.NORTH);
 
-        this.add(jPanel, BorderLayout.CENTER);
-        jPanel.add(tabPane, BorderLayout.NORTH);
+        JPanel settingsPane = new JPanel();
+        this.add(settingsPane, BorderLayout.CENTER);
+
+        settingsPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
+        settingsPane.setLayout(new BorderLayout(0, 4));
+
+        settingsPane.add(tabPane, BorderLayout.NORTH);
         JPanel attrListenerPane = new AbstractAttrNoScrollPane() {
 
             @Override
@@ -176,18 +178,27 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
                         fireAttrChangeListener();
                     }
                 });
-                BasicScrollPane basicScrollPane = new AttrScrollPane() {
+                return new EmptyBorderAttrScrollPane() {
                     @Override
                     protected JPanel createContentPane() {
                         return centerPane;
                     }
                 };
-                return basicScrollPane;
             }
         };
-        jPanel.add(attrListenerPane, BorderLayout.CENTER);
+        settingsPane.add(attrListenerPane, BorderLayout.CENTER);
     }
 
     @Override
     public void updateBean(ThemedCellStyle ob) {}
+
+
+    private static abstract class EmptyBorderAttrScrollPane extends AttrScrollPane {
+
+        @Override
+        protected void layoutContentPane() {
+            super.layoutContentPane();
+            leftcontentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        }
+    }
 }