From 96f01dc0b733ad07d973d921d26824730bffc573 Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Fri, 16 Dec 2016 10:18:02 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-1222=20-=20=E8=A1=A8=E5=8D=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=9B=BE=E8=A1=A8=E6=B5=AE=E5=8A=A8=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=8D=E9=9A=8F=E4=B8=BB=E7=AA=97=E5=8F=A3=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/FormParaWidgetPane.java  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java b/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
index 58db063bc6..6187bbd486 100644
--- a/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
@@ -200,19 +200,17 @@ public class FormParaWidgetPane extends JPanel {
         chartPopUpButton.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
-                if (chartTypeWindow == null) {
-                    JPanel componentsPara = new JPanel(new FlowLayout(FlowLayout.LEFT));
-                    WidgetOption[] chartOptions = loadChartOptions();
-                    for (WidgetOption chartOption : chartOptions) {
-                        componentsPara.add(new ToolBarButton(chartOption));
-                    }
-                    int x = COMMON_CHAR_NUM * (widgetButtonWidth + smallGAP);
-                    int y = (int) Math.ceil(chartOptions.length / ((double) COMMON_CHAR_NUM)) * (widgetButtonHeight + smallGAP);
-                    componentsPara.setPreferredSize(new Dimension(x, y));
-                    chartTypeWindow = new PopUpWindow(componentsPara, Inter.getLocText("FR-Designer-Form-ToolBar_Chart"));
-                    chartTypeWindow.setLocation((int) jSeparatorLayout.getLocationOnScreen().getX() + 1, (int) jSeparatorLayout.getLocationOnScreen().getY());
-                    chartTypeWindow.setSize(chartTypeWindow.getPreferredSize());
+                JPanel componentsPara = new JPanel(new FlowLayout(FlowLayout.LEFT));
+                WidgetOption[] chartOptions = loadChartOptions();
+                for (WidgetOption chartOption : chartOptions) {
+                    componentsPara.add(new ToolBarButton(chartOption));
                 }
+                int x = COMMON_CHAR_NUM * (widgetButtonWidth + smallGAP);
+                int y = (int) Math.ceil(chartOptions.length / ((double) COMMON_CHAR_NUM)) * (widgetButtonHeight + smallGAP);
+                componentsPara.setPreferredSize(new Dimension(x, y));
+                chartTypeWindow = new PopUpWindow(componentsPara, Inter.getLocText("FR-Designer-Form-ToolBar_Chart"));
+                chartTypeWindow.setLocation((int) jSeparatorLayout.getLocationOnScreen().getX() + 1, (int) jSeparatorLayout.getLocationOnScreen().getY());
+                chartTypeWindow.setSize(chartTypeWindow.getPreferredSize());
                 chartTypeWindow.setVisible(true);
             }
         });