From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunAllAreaView.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/LogicView/FunAllAreaView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunAllAreaView.cs
similarity index 91%
rename from HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/LogicView/FunAllAreaView.cs
rename to HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunAllAreaView.cs
index 4381fa0..9f803da 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/LogicView/FunAllAreaView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunAllAreaView.cs
@@ -17,8 +17,8 @@
/// </summary>
public Button btnIcon1 = new Button
{
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
Y = Application.GetRealHeight(19),
X = Application.GetRealWidth(TextSize.left16),
UnSelectedImagePath = "LogicIcon/down.png",
@@ -45,8 +45,8 @@
/// </summary>
public Button btnIcon2 = new Button
{
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
Y = Application.GetRealHeight(19),
X = Application.GetRealWidth(122),
UnSelectedImagePath = "LogicIcon/down.png",
--
Gitblit v1.8.0