From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
index 88d8da6..b53b1c9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
@@ -76,11 +76,16 @@
//鏈�澶ф樉绀�5涓�
int rowCount = this.RowCount > 5 ? 5 : this.RowCount;
- if (rowCount < 5 && titleText != null)
+ if (titleText != null)
{
- //鑿滃崟+1
- rowCount++;
+ //449瀹藉害鐨勬椂鍊欙紝鍗充娇鏄庣粏宸茬粡瓒呰繃浜�5涓紝浣嗘槸杩樻槸鍙互+1鐨�,鍥犱负杩欎釜妯″紡澶氫簡涓�寮犲浘鐗�
+ if (rowCount < 5 || i_widthType == 2)
+ {
+ //鑿滃崟+1
+ rowCount++;
+ }
}
+
//鑳屾櫙
var frameBack = new FrameLayout();
frameBack.X = Application.GetRealWidth(662 - (RowWidth - 395));
@@ -92,6 +97,7 @@
var frameTable = new FrameLayout();
frameTable.Y = Application.GetRealHeight(16);
+ frameTable.Height = Application.GetRealHeight(RowHeight * rowCount);
frameBack.AddChidren(frameTable);
if (titleText != null)
@@ -105,18 +111,18 @@
//鍒楄〃鎺т欢
this.listView = new VerticalListControl();
- listView.Height = frameTable.Height;
- if (rowCount == 5)
- {
- //杩炲甫鏍囬,鍙兘鏄剧ず5琛�
- listView.Height = frameTable.Height - Application.GetRealHeight(RowHeight);
- }
+ listView.Radius = (uint)Application.GetRealHeight(17);
if (titleText != null)
{
//鎷ユ湁鏍囬
listView.Y = Application.GetRealHeight(RowHeight);
+ listView.Height = frameTable.Height - Application.GetRealHeight(RowHeight);
}
- listView.Radius = (uint)Application.GetRealHeight(17);
+ else
+ {
+ //娌℃湁鏍囬
+ listView.Height = frameTable.Height;
+ }
frameTable.AddChidren(listView);
}
@@ -210,6 +216,7 @@
if (btnText != null)
{
btnText.TextColor = select == true ? UserCenterColor.Current.TextColor1 : UserCenterColor.Current.TextGrayColor1;
+ btnText.IsBold = select;
}
//鍓嶅洖閫夋嫨鐨勮彍鍗曚负null,鎴栬�呮槸鐩稿悓鐨勪笢瑗�,鍒欎笉澶勭悊
if (this.oldRowFrame == null || this.oldRowFrame.MainKeys == frame.MainKeys)
--
Gitblit v1.8.0