From d44eebbc571c1f29a448f0da82ab2fe162090654 Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Wed, 9 Aug 2017 19:42:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E8=A7=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/mainframe/ReportFloatPane.java | 12 ++++++++++--
 designer_base/src/com/fr/start/BaseDesigner.java     |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/ReportFloatPane.java b/designer/src/com/fr/design/mainframe/ReportFloatPane.java
index 85ecc85bf3..70df8d3337 100644
--- a/designer/src/com/fr/design/mainframe/ReportFloatPane.java
+++ b/designer/src/com/fr/design/mainframe/ReportFloatPane.java
@@ -2,6 +2,7 @@ package com.fr.design.mainframe;
 
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.core.ActionFactory;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
@@ -42,7 +43,14 @@ public class ReportFloatPane extends JPanel {
         UIToolbar topToolBar = new UIToolbar();
         topToolBar.setLayout(new BorderLayout());
         insertFloatMenu = createInsertToolBar();
-        topToolBar.add(createButtonUI());
+        topToolBar.setPreferredSize(new Dimension(155,20));
+        topToolBar.add(createButtonUI(), BorderLayout.CENTER);
+        topToolBar.setBorder(BorderFactory.createEmptyBorder(-1, -1, -1, -1));
+
+        JPanel toolBarPane = new JPanel(new BorderLayout());
+        toolBarPane.add(topToolBar, BorderLayout.CENTER);
+        toolBarPane.setBorder(BorderFactory.createLineBorder(UIConstants.POP_DIALOG_BORDER));
+        toolBarPane.setPreferredSize(new Dimension(155,20));
         UILabel emptyLabel = new UILabel();
         emptyLabel.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0));
 
@@ -51,7 +59,7 @@ public class ReportFloatPane extends JPanel {
         double[] columnSize = {p, p, p, f};
         double[] rowSize = {p};
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(), new UILabel(Inter.getLocText("FR-Designer_Add_FloatElement")), emptyLabel, topToolBar},
+                new Component[]{new UILabel(), new UILabel(Inter.getLocText("FR-Designer_Add_FloatElement")), emptyLabel, toolBarPane},
         };
         JPanel leftTopPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         leftTopPane.setBorder(BorderFactory.createEmptyBorder(10, 4, 0, 13));
diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java
index c393237a77..e2c3a717d6 100644
--- a/designer_base/src/com/fr/start/BaseDesigner.java
+++ b/designer_base/src/com/fr/start/BaseDesigner.java
@@ -93,7 +93,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
 
         initDefaultFont();
         //PluginManager要在环境切换和模块启动之前初始化
-        PluginManager.registerEnvListener();
+//        PluginManager.registerEnvListener();
         // 必须先初始化Env再去startModule, 不然会导致lic读取不到
         ModuleContext.startModule(module2Start());