Merge branch 'fbp-1.0' of ssh://code.fineres.com:7999/~vito/c-design into fbp-1.0

designer-base/src/main/java/com/fr/design/dialog/BasicDialog.java

@@ -52,6 +52,15 @@ public abstract class BasicDialog extends UIDialog {
 		super.setSize(FineUIScale.scale(d.width), FineUIScale.scale(d.height));
 	}
 
+	/**
+	 * 设置对话框大小,本方法不进行主动缩放
+	 *
+	 * @param d 对话框尺寸
+	 */
+	protected void setBasicDialogSizeNoScale(Dimension d) {
+		super.setSize(d.width, d.height);
+	}
+
 	/**
 	 * 设置对话框大小，方法内已进行dpi适配，传参无需考虑dpi适配
 	 *
@@ -62,6 +71,16 @@ public abstract class BasicDialog extends UIDialog {
 		setBasicDialogSize(new Dimension(w, h));
 	}
 
+	/**
+	 * 设置对话框大小,本方法不进行主动缩放
+	 *
+	 * @param w 宽度
+	 * @param h 高度
+	 */
+	protected void setBasicDialogSizeNoScale(int w, int h) {
+		setBasicDialogSizeNoScale(new Dimension(w, h));
+	}
+
 	@Override
 	public void setSize(Dimension d) {
 		throw new UnsupportedOperationException();

designer-base/src/main/java/com/fr/design/dialog/BasicPane.java

@@ -14,7 +14,6 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
 import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
 import javax.swing.event.DocumentEvent;
 import java.awt.BorderLayout;
 import java.awt.Dialog;
@@ -179,17 +178,12 @@ public abstract class BasicPane extends JPanel {
             dg = new DIALOG((Dialog) window, isNeedButtonPane);
         }
 
-        SwingUtilities.invokeLater(() -> {
-            if (l != null) {
-                dg.addDialogActionListener(l);
-            }
-            dg.setBasicDialogSize(dimension);
-            GUICoreUtils.centerWindow(dg);
-            dg.setResizable(false);
-            dg.setVisible(true);
-            dg.toFront();
-            dg.requestFocus();
-        });
+        if (l != null) {
+            dg.addDialogActionListener(l);
+        }
+        dg.setBasicDialogSize(dimension);
+        GUICoreUtils.centerWindow(dg);
+        dg.setResizable(false);
         return dg;
     }
 

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -745,7 +745,6 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
     public BasicDialog showLargeWindow(Window window, DialogActionListener l) {
         Dimension dimension = new Dimension(900, 640);
         BasicDialog basicDialog = super.showWindowWithCustomSize(window, l, dimension);
-        basicDialog.setMinimumSize(dimension);
         basicDialog.setResizable(true);
         return basicDialog;
     }