From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs
old mode 100755
new mode 100644
index 08e3756..2a67225
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs
@@ -48,8 +48,8 @@
/// </summary>
public Button btnStateIcon = new Button
{
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
Y = Application.GetRealHeight(8),
X = Application.GetRealWidth(TextSize.left12),
@@ -60,8 +60,8 @@
public Button btnLienIcon = new Button
{
- Width = Application.GetMinRealAverage(20),
- Height = Application.GetMinRealAverage(20),
+ Width = Application.GetRealWidth(20),
+ Height = Application.GetRealWidth(20),
Y = Application.GetRealHeight(66),
X = Application.GetRealWidth(48),
@@ -81,7 +81,7 @@
};
/// <summary>
- /// 鍥炬爣寮�鍏�
+ /// 鐐瑰嚮浜嬩欢
/// </summary>
public Button btnclick= new Button
{
--
Gitblit v1.8.0