From 5ca14d0531c28784fe8a2dda673bc574e3aa3f14 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 9 Aug 2017 19:06:36 +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 --- .../com/fr/quickeditor/floatquick/FloatImageQuickEditor.java | 2 +- .../com/fr/quickeditor/floatquick/FloatStringQuickEditor.java | 4 ++-- designer_base/src/com/fr/start/BaseDesigner.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/designer/src/com/fr/quickeditor/floatquick/FloatImageQuickEditor.java b/designer/src/com/fr/quickeditor/floatquick/FloatImageQuickEditor.java index e051c428c..81507186b 100644 --- a/designer/src/com/fr/quickeditor/floatquick/FloatImageQuickEditor.java +++ b/designer/src/com/fr/quickeditor/floatquick/FloatImageQuickEditor.java @@ -42,7 +42,7 @@ public class FloatImageQuickEditor extends FloatQuickEditor { JPanel pane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.setLayout(new BorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(10, 78, 10, 17)); + this.setBorder(BorderFactory.createEmptyBorder(10, 75, 10, 15)); this.add(pane, BorderLayout.CENTER); diff --git a/designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java b/designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java index cd48df459..a59a0ccb7 100644 --- a/designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java +++ b/designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java @@ -37,7 +37,7 @@ public class FloatStringQuickEditor extends FloatQuickEditor { JPanel pane = new JPanel(new BorderLayout(5, 0)); pane.add(stringTextField, BorderLayout.CENTER); pane.add(formulaButton, BorderLayout.EAST); - pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,7)); + pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,5)); formulaButton.setVisible(false); this.setLayout(new BorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); @@ -73,7 +73,7 @@ public class FloatStringQuickEditor extends FloatQuickEditor { Formula formula = (Formula) value; str = formula.getContent(); stringTextField.setLineWrap(false); - this.setBorder(BorderFactory.createEmptyBorder(10, 78, 10, 10)); + this.setBorder(BorderFactory.createEmptyBorder(10, 75, 10, 10)); reserveInResult = formula.isReserveInResult(); reserveOnWriteOrAnaly = formula.isReserveOnWriteOrAnaly(); } else { diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index c393237a7..e2c3a717d 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());