From e7290281eabcb88d2e430dea9782565474837ce1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 20 十月 2023 14:29:54 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
index 9f8dc40..a1c9ea6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
@@ -55,12 +55,23 @@
public Button btnState = new Button
{
TextSize = TextSize.text12,
- Width = Application.GetRealWidth(130),
+ Width = Application.GetRealWidth(130+20),
Height = Application.GetRealHeight(17),
TextColor = CSS.CSS_Color.textCancelColor,
Y = Application.GetRealHeight(14),
- X = Application.GetRealWidth(165),
+ X = Application.GetRealWidth(165-10),
TextAlignment = TextAlignment.CenterRight,
+ };
+ /// <summary>
+ /// 锛堟潯浠舵垨鑰呯洰鏍囷級鑹茬洏涓撶敤
+ /// </summary>
+ public Button btnStateColor = new Button
+ {
+ Width = Application.GetRealWidth(10),
+ Height = Application.GetRealWidth(10),
+ Radius = (uint)Application.GetRealHeight(5),
+ X = Application.GetRealWidth(315 - 10),
+ Visible=false,
};
/// <summary>
@@ -122,12 +133,14 @@
verticalScrolView.AddChidren(frameLayout);
frameLayout.AddChidren(rowLayout);
btnIcon.Gravity = Gravity.CenterVertical;
+ btnStateColor.Gravity = Gravity.CenterVertical;
btnText.Gravity = Gravity.CenterVertical;
btnText.TextAlignment = TextAlignment.CenterLeft;
btnNextIcon.Gravity = Gravity.CenterVertical;
rowLayout.AddChidren(btnIcon);
rowLayout.AddChidren(btnText);
rowLayout.AddChidren(btnState);
+ rowLayout.AddChidren(btnStateColor);
rowLayout.AddChidren(btnNextIcon);
rowLayout.AddRightView(btnDelay);
rowLayout.AddRightView(btnDel);
--
Gitblit v1.8.0