From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
index 272203e..373ca78 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
@@ -49,6 +49,7 @@
public SceneFunctionSwitchControl()
{
this.Height = Application.GetRealHeight(90);
+ this.Y = Application.GetRealHeight(40);
}
/// <summary>
@@ -66,7 +67,7 @@
{
btnTemp.Text = listTitleText[i];
//寮�濮嬪垵濮嬪寲
- XX = this.InitTitleTextControl(i, listTitleText[i], btnTemp.GetTextWidth(), XX);
+ XX = this.InitTitleTextControl(i, listTitleText[i], btnTemp.GetRealWidthByText(), XX);
}
//鍥炶皟鏂规硶
this.frameDefult.ButtonClickEvent?.Invoke(null, null);
@@ -89,6 +90,7 @@
//鍚嶇О
var btnName = new NormalViewControl(frameBack.Width, Application.GetRealHeight(63), false);
btnName.Text = titleText;
+ btnName.TextAlignment = TextAlignment.Center;
if (m_nowSelectIndex == i_index)
{
this.frameDefult = frameBack;
--
Gitblit v1.8.0