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/Device/CommonForm/SelectSceneStatuRow.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectSceneStatuRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectSceneStatuRow.cs
index 5598511..6f92f8b 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectSceneStatuRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectSceneStatuRow.cs
@@ -73,6 +73,7 @@
Height = Application.GetRealHeight(80),
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
+ TextSize=14
};
AddChidren(NameBtn);
@@ -96,10 +97,10 @@
line = new Button()
{
X = Application.GetRealWidth(81),
- Y = this.Height - 2,
+ Y = this.Height - 1,
Width = Application.GetRealWidth(919),
- Height = 2,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
};
AddChidren(line);
}
--
Gitblit v1.8.0