From a114d541b540b92426815aa7cb9348db2e8bd089 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Fri, 11 Aug 2017 14:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=A7=E6=89=BF=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...anChartTabPane.java => AbstractVanChartScrollPane.java} | 4 ++--
 .../fr/plugin/chart/designer/style/VanChartLegendPane.java | 4 ++--
 .../fr/plugin/chart/designer/style/VanChartTitlePane.java  | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename designer_chart/src/com/fr/plugin/chart/designer/{AbstractVanChartTabPane.java => AbstractVanChartScrollPane.java} (86%)

diff --git a/designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartTabPane.java b/designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java
similarity index 86%
rename from designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartTabPane.java
rename to designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java
index 5fa51376ab..843b958a1e 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartTabPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/AbstractVanChartScrollPane.java
@@ -1,7 +1,7 @@
 package com.fr.plugin.chart.designer;
 
+import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
-import com.fr.design.mainframe.chart.gui.style.AbstractChartTabPane;
 
 import javax.swing.*;
 import java.awt.*;
@@ -9,7 +9,7 @@ import java.awt.*;
 /**
  * Created by mengao on 2017/8/11.
  */
-public abstract class AbstractVanChartTabPane<T> extends AbstractChartTabPane<T> {
+public abstract class AbstractVanChartScrollPane<T> extends BasicScrollPane<T> {
 
     protected void layoutContentPane() {
         leftcontentPane = createContentPane();
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartLegendPane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartLegendPane.java
index 2cbb947790..12f5cb4dc9 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartLegendPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartLegendPane.java
@@ -4,7 +4,7 @@ import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.plugin.chart.attr.VanChartLegend;
-import com.fr.plugin.chart.designer.AbstractVanChartTabPane;
+import com.fr.plugin.chart.designer.AbstractVanChartScrollPane;
 import com.fr.plugin.chart.designer.PlotFactory;
 import com.fr.plugin.chart.vanchart.VanChart;
 
@@ -14,7 +14,7 @@ import java.awt.*;
 /**
  * 属性表, 图表样式-图例 界面.
  */
-public class VanChartLegendPane extends AbstractVanChartTabPane<VanChart> {
+public class VanChartLegendPane extends AbstractVanChartScrollPane<VanChart> {
     private static final long serialVersionUID = 7553135492053931171L;
 
     private VanChartPlotLegendPane legendContent;
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartTitlePane.java b/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartTitlePane.java
index b62fe4062b..fb235a73e6 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartTitlePane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/style/VanChartTitlePane.java
@@ -18,7 +18,7 @@ import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.attr.VanChartTitle;
-import com.fr.plugin.chart.designer.AbstractVanChartTabPane;
+import com.fr.plugin.chart.designer.AbstractVanChartScrollPane;
 import com.fr.plugin.chart.designer.TableLayout4VanChartHelper;
 import com.fr.plugin.chart.designer.component.VanChartFloatPositionPane;
 import com.fr.plugin.chart.designer.component.background.VanChartBackgroundWithOutShadowWithRadiusPane;
@@ -37,7 +37,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
 // 属性表-样式 标题界面
-public class VanChartTitlePane extends AbstractVanChartTabPane<VanChart> {
+public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
     private static final long serialVersionUID = -2438898431228882682L;
 
     private static final int WIDTH = 165;
@@ -146,12 +146,13 @@ public class VanChartTitlePane extends AbstractVanChartTabPane<VanChart> {
                 new Component[]{new UILabel(Inter.getLocText("BorderLayout-Constraints"), SwingConstants.LEFT),alignmentPane},
                 new Component[]{null,customFloatPositionButton}
         };
+        int[][] rowCount = {{1, 8}, {1, 8}, {1, 8}};
 
         customFloatPositionPane =  new VanChartFloatPositionPane();
 
         initPositionListener();
 
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col);
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col,rowCount);
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart_Layout"), panel);
     }