From c62644c529d7c42d040c4ba9d9de6a9fa265996c Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Tue, 30 Jan 2018 20:22:17 +0800
Subject: [PATCH] =?UTF-8?q?MOBILE-6262=20FR9.0=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E6=89=8B=E6=9C=BA=E7=AB=AF=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E7=94=BB=E5=B8=83=E5=8F=82=E8=80=83=E5=B0=BA=E5=AF=B8=3D>?=
 =?UTF-8?q?=E5=BD=93=E5=AE=BD=E5=BA=A6=E4=B8=BA375=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=E5=90=8E=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=AE=BE=E7=BD=AE=E9=AB=98=E5=BA=A6=E4=B8=BA=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/mainframe/FormArea.java | 27 +++++++------------
 .../actions/FormMobileAttrAction.java         |  2 ++
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/FormArea.java b/designer_form/src/com/fr/design/mainframe/FormArea.java
index 37f05cfcb1..caab605dc1 100644
--- a/designer_form/src/com/fr/design/mainframe/FormArea.java
+++ b/designer_form/src/com/fr/design/mainframe/FormArea.java
@@ -102,27 +102,18 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         }
         this.setFocusTraversalKeysEnabled(false);
         this.designer.addMouseWheelListener(showValSpinnerMouseWheelListener);
-        initMobileAttrModifiedListener();
+        widthPane.setEnabled(!jForm.getTarget().getFormMobileAttr().isMobileOnly());
     }
 
-    private void initMobileAttrModifiedListener() {
-        if (jForm == null) {
-            return;
+    public void onMobileAttrModified() {
+        FormMobileAttr formMobileAttr = jForm.getTarget().getFormMobileAttr();
+        if (formMobileAttr.isMobileOnly()) {
+            widthPane.setValue(MOBILE_ONLY_WIDTH);
+            changeWidthPaneValue(MOBILE_ONLY_WIDTH);
+            heightPane.setValue(MOBILE_ONLY_HEIGHT);
+            changeHeightPaneValue(MOBILE_ONLY_HEIGHT);
         }
-        jForm.addTargetModifiedListener(new TargetModifiedListener() {
-            @Override
-            public void targetModified(TargetModifiedEvent e) {
-                FormMobileAttr formMobileAttr = jForm.getTarget().getFormMobileAttr();
-                if (formMobileAttr.isMobileOnly() && Math.abs(widthPane.getValue() - MOBILE_ONLY_WIDTH) > 0.0000001) {
-                    widthPane.setValue(MOBILE_ONLY_WIDTH);
-                    changeWidthPaneValue(MOBILE_ONLY_WIDTH);
-                    heightPane.setValue(MOBILE_ONLY_HEIGHT);
-                    changeHeightPaneValue(MOBILE_ONLY_HEIGHT);
-                }
-                widthPane.setEnabled(!formMobileAttr.isMobileOnly());
-            }
-        });
-        widthPane.setEnabled(!jForm.getTarget().getFormMobileAttr().isMobileOnly());
+        widthPane.setEnabled(!formMobileAttr.isMobileOnly());
     }
 
     MouseWheelListener showValSpinnerMouseWheelListener = new MouseWheelListener() {
diff --git a/designer_form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java b/designer_form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java
index bb5bf0ce78..17a4458bd8 100644
--- a/designer_form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java
+++ b/designer_form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java
@@ -6,6 +6,7 @@ import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.form.mobile.FormMobileAttrPane;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.FormArea;
 import com.fr.design.mainframe.JForm;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.form.main.Form;
@@ -52,6 +53,7 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
             public void doOk() {
                 FormMobileAttr formMobileAttr = mobileAttrPane.updateBean();
                 formTpl.setFormMobileAttr(formMobileAttr);
+                ((FormArea)jf.getFormDesign().getParent()).onMobileAttrModified();
                 jf.fireTargetModified();
                 if (formMobileAttr.isMobileOnly()) {
                     FunctionProcessor processor = ExtraClassManager.getInstance().getFunctionProcessor();