From f67dea4d07c18aa4315f76a6a698eebd0c8b9287 Mon Sep 17 00:00:00 2001
From: juhaoyu <2335173323@qq.com>
Date: Wed, 12 Jul 2017 11:41:06 +0800
Subject: [PATCH] =?UTF-8?q?PFC-607=20=E6=8F=92=E4=BB=B6=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9B=B4=E6=96=B0=E4=B8=8D=E9=87=8D=E5=90=AF?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/gui/xpane/ToolTipEditor.java    | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/designer_form/src/com/fr/design/gui/xpane/ToolTipEditor.java b/designer_form/src/com/fr/design/gui/xpane/ToolTipEditor.java
index 8306bb9d6..6fbc858b0 100644
--- a/designer_form/src/com/fr/design/gui/xpane/ToolTipEditor.java
+++ b/designer_form/src/com/fr/design/gui/xpane/ToolTipEditor.java
@@ -17,6 +17,12 @@ import com.fr.form.ui.EditorHolder;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.WidgetValue;
 import com.fr.general.Background;
+import com.fr.general.GeneralContext;
+import com.fr.plugin.context.PluginContext;
+import com.fr.plugin.injectable.PluginModule;
+import com.fr.plugin.manage.PluginFilter;
+import com.fr.plugin.observer.PluginEvent;
+import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.ArrayUtils;
 
 import javax.swing.*;
@@ -27,12 +33,31 @@ import java.awt.event.MouseEvent;
 import java.awt.geom.RoundRectangle2D;
 
 public class ToolTipEditor extends JWindow {
-	
-	private static ToolTipEditor editor = new ToolTipEditor();
-	
-	public static ToolTipEditor getInstance() {
-		return editor;
-	}
+    
+    private static volatile ToolTipEditor editor = new ToolTipEditor();
+    
+    static {
+        GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
+            
+            @Override
+            public void on(PluginEvent event) {
+                
+                editor = new ToolTipEditor();
+            }
+        }, new PluginFilter() {
+            
+            @Override
+            public boolean accept(PluginContext context) {
+                
+                return context.contain(PluginModule.ExtraDesign);
+            }
+        });
+    }
+    
+    public static ToolTipEditor getInstance() {
+        
+        return editor;
+    }
 
 	private XEditorHolder holder;
 	private Border buttonBorder = new UIRoundedBorder(new Color(149, 149, 149), 1, 5);