Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev

designer_base/src/com/fr/design/extra/PluginShopDialog.java

@@ -4,17 +4,23 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.Inter;
+import javafx.embed.swing.JFXPanel;
 
+import javax.swing.*;
 import java.awt.*;
 
 /**
  * Created by vito on 16/4/18.
  */
 public class PluginShopDialog extends UIDialog {
-    private static final Dimension DEFAULT_SHOP = new Dimension(900, 684);
+    private static final Dimension DEFAULT_SHOP = new Dimension(900, 700);
 
     public PluginShopDialog(Frame frame, BasicPane pane) {
-        super(frame, pane, false);
+        super(frame);
+        setUndecorated(true);
+        JPanel panel = (JPanel) getContentPane();
+        panel.setLayout(new BorderLayout());
+        add(pane, BorderLayout.CENTER);
         setSize(DEFAULT_SHOP);
         GUICoreUtils.centerWindow(this);
         setResizable(false);

designer_base/src/com/fr/design/extra/PluginWebBridge.java

@@ -285,6 +285,16 @@ public class PluginWebBridge {
         }
     }
 
+    /**
+     * 窗口是否无装饰(判断是否使用系统标题栏)
+     */
+    public boolean isCustomTitleBar() {
+        if (uiDialog != null) {
+            return uiDialog.isUndecorated();
+        }
+        return false;
+    }
+
     /**
      * 在本地浏览器里打开url
      * tips:重载的时候,需要给js调用的方法需要放在前面,否则可能不会被调用(此乃坑)