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/CategoryFunctionForWinRow.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs
index d31b0e0..f11e9ee 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs
@@ -52,7 +52,7 @@
v_Selected = value;
try
{
- SetOnLineStatu(v_Selected);
+ SetStatu(v_Selected);
}
catch
{
@@ -75,7 +75,7 @@
Y = Application.GetRealHeight(y);
Width = Application.GetRealWidth(1022);
Height = Application.GetRealHeight(127);
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+ //BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
}
/// <summary>
@@ -111,11 +111,12 @@
{
X = Application.GetRealWidth(181),
Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(600),
+ Width = Application.GetRealWidth(400),
Height = Application.GetRealHeight(58),
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
TextAlignment = TextAlignment.CenterLeft,
+ TextSize=14
};
AddChidren(NameBtn);
@@ -126,7 +127,8 @@
Width = Application.GetRealWidth(400),
Height = Application.GetRealHeight(49),
TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2
+ TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
+ TextSize=10
};
AddChidren(StatuBtn);
@@ -225,6 +227,8 @@
public void SetStatu(bool statu)
{
//OpenOrUpBtn.IsSelected = CloseOrDownBtn.IsSelected = StopBtn.IsSelected = statu;
+ NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = statu;
+ NameBtn.IsBold = statu;
}
/// <summary>
@@ -234,7 +238,7 @@
public void SetOnLineStatu(bool statu)
{
NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = statu;
-
+ NameBtn.IsBold = statu;
}
/// <summary>
--
Gitblit v1.8.0