From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs
index 1672a9f..28aac76 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs
@@ -9,7 +9,7 @@
/// <summary>
/// 鏈�涓婇潰鍧梀iew
/// </summary>
- public FrameLayout fLayout = new FrameLayout
+ public FrameLayout frameLayout = new FrameLayout
{
BackgroundColor = CSS.CSS_Color.viewTop,
Height = Application.GetRealHeight(64),
@@ -44,10 +44,10 @@
/// </summary>
public Button setBtn = new Button
{
- Y = Application.GetRealHeight(29),
+ Y = Application.GetRealHeight(28),
X = Application.GetRealWidth(337),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "LogicIcon/set.png",
Visible = false,
};
@@ -62,7 +62,7 @@
/// <summary>
/// 璁剧疆鍥炬爣澧炲姞鐑敭澶у皬
/// </summary>
- public Button clickSetBtn = new Button
+ public Button clickSetBtn = new Button
{
X = Application.GetRealWidth(337 - 37),
Width = Application.GetMinRealAverage(28 + 37),
@@ -74,12 +74,12 @@
/// <returns></returns>
public FrameLayout FLayoutView()
{
- fLayout.AddChidren(topNameBtn);
- fLayout.AddChidren(backBtn);
- fLayout.AddChidren(setBtn);
- fLayout.AddChidren(clickBackBtn);
- fLayout.AddChidren(clickSetBtn);
- return fLayout;
+ frameLayout.AddChidren(topNameBtn);
+ frameLayout.AddChidren(backBtn);
+ frameLayout.AddChidren(setBtn);
+ frameLayout.AddChidren(clickBackBtn);
+ frameLayout.AddChidren(clickSetBtn);
+ return frameLayout;
}
#endregion
}
--
Gitblit v1.8.0