From f6a7a17a55b1c5a22a7c4ee2f6bd1cd68ead3539 Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Wed, 29 Nov 2017 14:51:29 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-5714=20=E6=B7=BB=E5=8A=A0=E9=A2=84?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8E=A7=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/FormParaWidgetPane.java  | 63 +++++++++----------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java b/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
index d28233d051..470337190a 100644
--- a/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
@@ -40,6 +40,7 @@ import java.util.List;
 public class FormParaWidgetPane extends JPanel {
     private static FormParaWidgetPane THIS;
     private final static int BORDER = 5;
+    private final static int WIDGET_WIDTHGAP = 4;
 
     private List<WidgetOption> predifinedwidgeList = new ArrayList<WidgetOption>();
 
@@ -123,39 +124,37 @@ public class FormParaWidgetPane extends JPanel {
     }
 
     private void initWidgetTypePopUp() {
-        if (widgetTypePopupMenu == null) {
-            JPanel widgetPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
-            loadPredefinedWidget();
-            int rowNum = calculateWidgetWindowRowNum();
-            JPanel westPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-            for (WidgetOption o : loadWidgetOptions()) {
-                westPanel.add(new ToolBarButton(o));
-            }
-            int x = commonWidgetNum * (widgetButtonWidth + smallGAP) - smallGAP;
-            westPanel.setPreferredSize(new Dimension(x, (int) (rowNum * westPanel.getPreferredSize().getHeight())));
-            JPanel eastPane = new JPanel(new FlowLayout(FlowLayout.LEFT));
-            for (WidgetOption no : predifinedwidgeList) {
-                eastPane.add(new ToolBarButton(no));
-            }
-            int maxWidth = preWidgetShowMaxNum * (widgetButtonWidth + smallGAP) - smallGAP;
-            int width = predifinedwidgeList.size() >= preWidgetShowMaxNum ? maxWidth : (int) eastPane.getPreferredSize().getWidth();
-            eastPane.setPreferredSize(new Dimension(width, (int) (rowNum * eastPane.getPreferredSize().getHeight())));
-
-            UIScrollPane eastScrollPane = new UIScrollPane(eastPane);
-            eastScrollPane.setBorder(null);
-            int maxHeight = preWidgetShowMaxRow * (widgetButtonHeight + smallGAP) - smallGAP;
-            int height = predifinedwidgeList.size() >= preWidgetShowMaxNum * preWidgetShowMaxRow ? maxHeight : (int) eastPane.getPreferredSize().getHeight();
-            width = predifinedwidgeList.size() >= preWidgetShowMaxNum * preWidgetShowMaxRow ? (int) eastPane.getPreferredSize().getWidth() + smallGAP + jsparatorWidth : (int) eastPane.getPreferredSize().getWidth();
-            eastScrollPane.setPreferredSize(new Dimension(width, height));
-
-            widgetPane.add(westPanel);
-            widgetPane.add(createJSeparator(height));
-            widgetPane.add(eastScrollPane);
-
-            widgetTypePopupMenu = new UIPopupMenu();
-            widgetTypePopupMenu.setBackground(UIConstants.SELECT_TAB);
-            widgetTypePopupMenu.add(widgetPane);
+        JPanel widgetPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        loadPredefinedWidget();
+        int rowNum = calculateWidgetWindowRowNum();
+        JPanel westPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        for (WidgetOption o : loadWidgetOptions()) {
+            westPanel.add(new ToolBarButton(o));
+        }
+        int x = commonWidgetNum * (widgetButtonWidth + smallGAP) - smallGAP;
+        westPanel.setPreferredSize(new Dimension(x, (int) (rowNum * westPanel.getPreferredSize().getHeight())));
+        JPanel eastPane = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        for (WidgetOption no : predifinedwidgeList) {
+            eastPane.add(new ToolBarButton(no));
         }
+        int maxWidth = preWidgetShowMaxNum * (widgetButtonWidth + smallGAP) - smallGAP + WIDGET_WIDTHGAP;
+        int width = predifinedwidgeList.size() >= preWidgetShowMaxNum ? maxWidth : (int) eastPane.getPreferredSize().getWidth();
+        eastPane.setPreferredSize(new Dimension(width, (int) (rowNum * eastPane.getPreferredSize().getHeight())));
+
+        UIScrollPane eastScrollPane = new UIScrollPane(eastPane);
+        eastScrollPane.setBorder(null);
+        int maxHeight = preWidgetShowMaxRow * (widgetButtonHeight + smallGAP) - smallGAP;
+        int height = predifinedwidgeList.size() >= preWidgetShowMaxNum * preWidgetShowMaxRow ? maxHeight : (int) eastPane.getPreferredSize().getHeight();
+        width = predifinedwidgeList.size() >= preWidgetShowMaxNum * preWidgetShowMaxRow ? (int) eastPane.getPreferredSize().getWidth() + smallGAP + jsparatorWidth : (int) eastPane.getPreferredSize().getWidth();
+        eastScrollPane.setPreferredSize(new Dimension(width, height));
+
+        widgetPane.add(westPanel);
+        widgetPane.add(createJSeparator(height));
+        widgetPane.add(eastScrollPane);
+
+        widgetTypePopupMenu = new UIPopupMenu();
+        widgetTypePopupMenu.setBackground(UIConstants.SELECT_TAB);
+        widgetTypePopupMenu.add(widgetPane);
     }
 
     private void initChartTypePopUp() {