From 6ab3029836b3e308bf42687afb272ff711a992ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Fri, 25 Sep 2020 17:23:33 +0800
Subject: [PATCH] CHART-15269 && CHART-15926 bugfix

---
 .../designer/component/VanChartUIListControlPane.java  |  3 +--
 .../map/designer/VanMapAreaPointAndLineGroupPane.java  | 10 +---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java
index 15e905e10..8a18814eb 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java
@@ -10,7 +10,6 @@ import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.Nameable;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
@@ -154,7 +153,7 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem
 
 
         HyperDialog(JComponent pane) {
-            super(DesignerContext.getDesignerFrame(), true);
+            super(SwingUtilities.getWindowAncestor(VanChartUIListControlPane.this));
             pane.setBorder(BorderFactory.createEmptyBorder(20, 10, 10, 10));
             this.editPane = pane;
             JPanel editPaneWrapper = new JPanel(new BorderLayout());
diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaPointAndLineGroupPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaPointAndLineGroupPane.java
index 569d0850c..127ad2989 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaPointAndLineGroupPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaPointAndLineGroupPane.java
@@ -1,10 +1,7 @@
 package com.fr.van.chart.map.designer;
 
 
-
-import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import javax.swing.border.Border;
 
 /**
  * Created by Mitisky on 16/5/20.
@@ -19,9 +16,4 @@ public class VanMapAreaPointAndLineGroupPane extends VanChartGroupPane {
     public VanMapAreaPointAndLineGroupPane(final JPanel areaPane, final JPanel pointPane, final JPanel linePane){
         super(new String[]{AREA_MAP_STRING, POINT_MAP_STRING, LINE_MAP_STRING}, new JPanel[]{areaPane, pointPane, linePane});
     }
-
-    @Override
-    protected Border getButtonGroupBorder () {
-        return BorderFactory.createEmptyBorder(0,8,0,18);
-    }
-}
+}
\ No newline at end of file