From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
index fece7db..b1caac1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
@@ -39,7 +39,7 @@
/// <summary>
/// 鍋氭垚涓�涓瓨鍦ㄤ簬鍙充笂瑙掔殑鑿滃崟鎺т欢
/// </summary>
- /// <param name="i_RowCount">涓�鍏辨湁鍑犺</param>
+ /// <param name="i_RowCount">涓�鍏辨湁鍑犺(涓嶅惈鏍囬)</param>
/// <param name="i_width">杩欎釜鑿滃崟鏈夊瀹�</param>
/// <param name="titleText">鏍囬鏂囨湰(濡傛灉涓嶄负绌�,鑿滃崟妯″紡鍙樻洿涓烘嫢鏈夋爣棰樼殑妯″紡)</param>
public TopRightMenuControl(int i_RowCount, int i_width = 395, string titleText = null)
@@ -66,15 +66,20 @@
//鏈�澶ф樉绀�5涓�
int rowCount = this.RowCount > 5 ? 5 : this.RowCount;
+ if (rowCount < 5 && titleText != null)
+ {
+ //鑿滃崟+1
+ rowCount++;
+ }
//妗屽竷
- var frameTable = new FrameLayoutControl(false);
+ var frameTable = new FrameLayout();
frameTable.X = Application.GetRealWidth(662 - (RowWidth - 395));
frameTable.Y = Application.GetRealHeight(158 + 15 + 1);
frameTable.Width = Application.GetRealWidth(RowWidth);
frameTable.Height = Application.GetRealHeight(RowHeight * rowCount);
frameTable.BackgroundColor = UserCenterColor.Current.White;
frameTable.BorderColor = UserCenterColor.Current.Transparent;
- frameTable.RadiusEx = 6;
+ frameTable.Radius = (uint)Application.GetRealHeight(17);
this.AddChidren(frameTable);
if (titleText != null)
@@ -99,7 +104,7 @@
//鎷ユ湁鏍囬
listView.Y = Application.GetRealHeight(RowHeight);
}
- listView.Radius = frameTable.Radius;
+ listView.Radius = (uint)Application.GetRealHeight(17);
frameTable.AddChidren(listView);
//涓夎褰㈠浘鏍�
--
Gitblit v1.8.0