From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs
index 70ee478..2d42405 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs
@@ -17,12 +17,16 @@
LogicView.TopView topView = new LogicView.TopView();
topView.frameLayout.Height = Application.GetRealHeight(64 + 20);
this.AddChidren(topView.FLayoutView());
+ topView.topNameBtn.Text = titelText;
+ //鑾峰彇瀹藉害
+ int widthValue = topView.topNameBtn.GetTextWidth();
+ int textWidth = (Application.GetRealWidth(255) - widthValue) / 2;
Button locationBtn = new Button
{
Width = Application.GetRealWidth(18),
Height = Application.GetRealWidth(18),
- X = Application.GetRealWidth(208),
- Y = Application.GetRealHeight(34),
+ X = Application.GetRealWidth(60 + 4) + textWidth + widthValue,
+ Y = Application.GetRealHeight(34 + 1),
UnSelectedImagePath = "LogicIcon/location.png",
};
@@ -41,7 +45,6 @@
{
RemoveFromParent();
};
- topView.topNameBtn.Text = titelText;
FrameLayout viewLayout = new FrameLayout
{
--
Gitblit v1.8.0