From a4d525d08da7b6fb985b0069c539c11b06306a9b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:28:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
index 167c1cc..101b40e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
@@ -214,6 +214,7 @@
public MostRightIconControl AddMostRightEmptyIcon(int i_width, int i_height)
{
var btnContr = new MostRightIconControl(i_width, i_height);
+ btnContr.UseClickStatu = false;
this.AddChidren(btnContr, ChidrenBindMode.NotBind);
btnContr.InitControl();
//澶嶅悎鎺т欢闇�瑕佺壒娈婂鐞�
@@ -226,7 +227,7 @@
this.rightIconSize = Application.GetMinRealAverage(i_width);
if (chidrenYaxis != 0)
{
- btnContr.Y += chidrenYaxis;
+ btnContr.btnIcon.Y += chidrenYaxis;
}
return btnContr;
--
Gitblit v1.8.0