From 2d8fef4603267b7a10e17ebb7ad35f6b7311440e Mon Sep 17 00:00:00 2001
From: WeiYanglu <Wei@WeiYangludeMacBook-Pro.local>
Date: Sun, 11 Aug 2019 02:05:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86=E3=80=81=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E7=AD=89=E5=85=A8=E8=A2=ABScale=E5=8C=85=E4=BD=8F?=
 =?UTF-8?q?=E4=BA=86=EF=BC=8C=E8=AE=BE=E7=BD=AE=E6=88=90=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?=E7=9A=84=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/mobile/ui/MobileStylePane.java    | 8 +++++++-
 .../designer/properties/mobile/MobileStylePropertyUI.java | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java
index c048c0d21..d0e949fa9 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java
@@ -6,7 +6,9 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.fun.MobileWidgetStyleProvider;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.form.ui.Widget;
+import com.fr.form.ui.container.WScaleLayout;
 import com.fr.form.ui.mobile.MobileStyle;
+import com.fr.form.ui.widget.CRBoundsWidget;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 
@@ -27,7 +29,11 @@ public class MobileStylePane extends BasicPane {
     private Map<String, BasicBeanPane<MobileStyle>> map = new HashMap<>();
 
     public MobileStylePane(Widget widget) {
-        this.widget = widget;
+        if(widget instanceof WScaleLayout) {
+            this.widget = ((CRBoundsWidget)((WScaleLayout) widget).getBoundsWidget()).getWidget();
+        } else {
+            this.widget = widget;
+        }
         init();
     }
 
diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/MobileStylePropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/MobileStylePropertyUI.java
index 1f52694b8..831f558cb 100644
--- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/MobileStylePropertyUI.java
+++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/MobileStylePropertyUI.java
@@ -1,6 +1,7 @@
 package com.fr.design.designer.properties.mobile;
 
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XWScaleLayout;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
 import com.fr.design.gui.itable.AbstractPropertyTable;
@@ -11,7 +12,11 @@ public class MobileStylePropertyUI extends AbstractWidgetPropertyUIProvider {
     private XCreator xCreator;
 
     public MobileStylePropertyUI(XCreator xCreator) {
-        this.xCreator = xCreator;
+        if(xCreator instanceof XWScaleLayout) {
+            this.xCreator = xCreator.getEditingChildCreator();
+        } else {
+            this.xCreator = xCreator;
+        }
     }
 
     @Override