From dbf79099f47d5f06223edfd5b8dc06c51b1830aa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十二月 2020 09:10:39 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
similarity index 98%
rename from HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/TimeTpye.cs
rename to HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index 634e7b0..5f4320a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/TimeTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -90,13 +90,13 @@
{
LogicView.TimeView timePointView = new LogicView.TimeView();
timePointView.FLayoutView(fLayout);
- EventHandler<MouseEventArgs> RemovefLayout = (sender, e1) =>
+ EventHandler<MouseEventArgs> removefLayout = (sender, e1) =>
{
//绉婚櫎fLayout鐣岄潰
fLayout.RemoveFromParent();
};
//鍙栨秷鐐瑰嚮浜嬩欢
- timePointView.btnCancel.MouseUpEventHandler += RemovefLayout;
+ timePointView.btnCancel.MouseUpEventHandler += removefLayout;
//鍔犺浇鏁版嵁鐣岄潰鐨勮缃柟娉�(鍒楄〃浜掍笉鑱斿姩)
timePointView.mUIPickerView.setNPicker(timePointView.GethStringList(), timePointView.GetmStringList(), null);
@@ -189,7 +189,7 @@
{
TextSize = LogicView.TextSize.text12,
Width = Application.GetRealWidth(32 + 3),
- Height = Application.GetRealHeight(20),
+ Height = Application.GetRealHeight(17),
TextColor = CSS.CSS_Color.textCancelColor,
Y = Application.GetRealHeight(17),
X = Application.GetRealWidth(260),
@@ -212,7 +212,7 @@
{
TextSize = LogicView.TextSize.text12,
Width = Application.GetRealWidth(32 + 3),
- Height = Application.GetRealHeight(20),
+ Height = Application.GetRealHeight(17),
TextColor = CSS.CSS_Color.textCancelColor,
Y = Application.GetRealHeight(17),
X = Application.GetRealWidth(260),
--
Gitblit v1.8.0