From af9c3e0b3b1eb370e966b3ca9db3f62848d4189b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 21 八月 2021 13:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index a097bcd..5b8f65b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -410,9 +410,9 @@
Button btnModeIcon = new Button()
{
X = btnTitle.X,
- Y = Application.GetRealHeight(41 * (modeList.IndexOf(m) + 1) + 10 + 8),
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealWidth(30),
+ Y = Application.GetRealHeight(44 * (modeList.IndexOf(m) + 1) + 10 + 8),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
IsSelected = device.GetAttrState(FunctionAttributeKey.Swing) == m,
};
modeChangeView.AddChidren(btnModeIcon);
@@ -431,10 +431,6 @@
};
modeChangeView.AddChidren(btnModeText);
- btnModeIcon.UnSelectedImagePath = acFunction.GetSwingIconPath(m, false);
- btnModeIcon.SelectedImagePath = acFunction.GetSwingIconPath(m);
- btnModeText.Text = acFunction.GetSwingAttrText(m);
-
if (modeList.IndexOf(m) < modeList.Count - 1)
{
modeChangeView.AddChidren(new Button()
@@ -446,6 +442,11 @@
BackgroundColor = CSS_Color.BackgroundColor,
});
}
+
+ btnModeIcon.UnSelectedImagePath = acFunction.GetSwingIconPath(m, false);
+ btnModeIcon.SelectedImagePath = acFunction.GetSwingIconPath(m);
+ btnModeText.Text = acFunction.GetSwingAttrText(m);
+
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
dialog.Close();
--
Gitblit v1.8.0