From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
index da3d79b..22daafb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
@@ -43,13 +43,14 @@
public void InitControl()
{
var btnTemp = new NormalViewControl(10, 10, false);
+ btnTemp.TextSize = 16;
btnTemp.TextID = R.MyInternationalizationString.uScence;
//鍦烘櫙妗�(鐐瑰嚮鑼冨洿鏈夌偣灏忥紝闇�瑕佹墿澶у畠鐨勭偣鍑昏寖鍥�)
var frameScene = new FrameLayoutControl();
frameScene.UseClickStatu = false;
frameScene.Height = Application.GetRealHeight(90);
- frameScene.Width = btnTemp.GetRealWidthByText(16);
+ frameScene.Width = btnTemp.GetRealWidthByText();
frameScene.X = ControlCommonResourse.XXLeft;
this.AddChidren(frameScene);
//鍦烘櫙
@@ -72,7 +73,7 @@
var frameFunc = new FrameLayoutControl();
frameFunc.UseClickStatu = false;
frameFunc.Height = Application.GetRealHeight(90);
- frameFunc.Width = btnTemp.GetRealWidthByText(16);
+ frameFunc.Width = btnTemp.GetRealWidthByText();
frameFunc.X = frameScene.Right + Application.GetRealWidth(58);
this.AddChidren(frameFunc);
//鍔熻兘
--
Gitblit v1.8.0