From e794ccb27e7f453624757410969c52338542f18c Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Thu, 8 Feb 2018 11:28:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-6563=20=E8=87=AA=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=EF=BC=8C=E6=8E=A7=E4=BB=B6=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E5=90=8E=E5=AF=BC=E8=87=B4frm=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=BF=AE=E6=94=B9body=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/designer/creator/XWFitLayout.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java b/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java
index 712a8588d1..e7b82e61e3 100644
--- a/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java
@@ -28,6 +28,8 @@ import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 
+import javax.swing.*;
+
 /**
  * @author jim
  * @date 2014-6-23
@@ -958,11 +960,13 @@ public class XWFitLayout extends XLayoutContainer {
     public boolean canAddInterval(int interval) {
     	int val = interval/2;
     	for (int i=0, len=this.getComponentCount(); i<len; i++) {
-    		Component comp = this.getComponent(i);
-    		Rectangle rec = comp.getBounds();
+			XCreator comp = (XCreator) this.getComponent(i);
+			Rectangle rec = comp.getBounds();
     		Dimension d = new Dimension(this.getWidth(), this.getHeight());
     		Rectangle bound = dealBound(rec, d, val, 0);
     		if (bound.width < minWidth || bound.height< minHeight) {
+				String widgetName = comp.toData().getWidgetName();
+				JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Engine_Invalid_Setting_Cause_Reach_Min_Widget_Size", widgetName));
     			return false;
     		}
     	}

From e3364947d7b96beee2f5c3614f2e61f7eeb6ec0b Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Thu, 8 Feb 2018 13:41:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-6563=20=E8=87=AA=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=EF=BC=8C=E6=8E=A7=E4=BB=B6=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E5=90=8E=20=E5=AF=BC=E8=87=B4frm=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=BF=AE=E6=94=B9body=E7=9A=84=E6=A0=B7=E5=BC=8F=3D>?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/designer/creator/XWFitLayout.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java b/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java
index e7b82e61e3..7fbc7f6dbb 100644
--- a/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java
@@ -28,7 +28,8 @@ import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 
-import javax.swing.*;
+import javax.swing.JOptionPane;
+
 
 /**
  * @author jim