From 4ce5177289b1d34e467de9d8790836559cc5a09e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 18:06:28 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
index 8f57ed6..1f8b11b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
@@ -268,7 +268,7 @@
{
i_width = Application.GetRealWidth(i_width);
}
- var btnContr = AddMostRightView(i_text, i_width, ControlCommonResourse.NormalControlHeight, false);
+ var btnContr = AddMostRightView(i_text, i_width, this.Height, false);
this.AddChidren(btnContr, ChidrenBindMode.BindEventOnly);
if (chidrenYaxis != 0)
{
@@ -295,7 +295,7 @@
}
var btnContr = new NormalViewControl(i_width, i_height, false);
btnContr.X = this.Width - ControlCommonResourse.XXLeft - i_width - rightIconSize + RightOffset;
- btnContr.Height = this.Height;
+ btnContr.Height = i_height;
btnContr.TextAlignment = TextAlignment.CenterRight;
btnContr.TextColor = UserCenterColor.Current.TextGrayColor1;
btnContr.Text = i_text;
--
Gitblit v1.8.0