From 9a4629512ccf8359efd88671c9317c3cc7faf0c8 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 29 八月 2022 16:46:40 +0800
Subject: [PATCH] Merge branch 'dev' into dev-temp
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/mFunView.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/mFunView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/mFunView.cs
index 2994079..3c10816 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/mFunView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/mFunView.cs
@@ -30,16 +30,16 @@
{
Y = Application.GetRealHeight(65),
X = Application.GetRealWidth(860 + 80),
- Width = Application.GetMinRealAverage(60),
- Height = Application.GetMinRealAverage(60),
+ Width = Application.GetRealWidth(60),
+ Height = Application.GetRealWidth(60),
UnSelectedImagePath = "ZigeeLogic/selected.png",
Visible = false,
};
public Button lineBtn = new Button
{
- Y = Application.GetRealHeight(155),
+ //Y = Application.GetRealHeight(155),
Width = Application.GetRealWidth(920),
- Height = Application.GetRealHeight(5),
+ Height = 1, //Application.GetRealHeight(5),
X = Application.GetRealWidth(80),
BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
@@ -51,6 +51,7 @@
{
frameLayout.AddChidren(titleBtn);
frameLayout.AddChidren(selectedIconBtn);
+ lineBtn.Y = frameLayout.Height - 1;
frameLayout.AddChidren(lineBtn);
frameLayout.AddChidren(clickviewBtn);
return frameLayout;
--
Gitblit v1.8.0