From f222fb8ae7d265f094922f31970e1e805672ee01 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 17 十月 2023 16:53:55 +0800
Subject: [PATCH] 2023年10月17日16:53:42
---
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs
index 9c3ddc1..e50215b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs
@@ -46,7 +46,7 @@
};
- public Button btnBottonLeftImage = new Button
+ public Button btnLeftImage = new Button
{
Width = Application.GetRealWidth(16),
Height = Application.GetRealWidth(16),
@@ -55,16 +55,15 @@
Name = "btnBottonLeftImage",
};
- public Button btnBottonName = new Button
+ public Button btnLeftName = new Button
{
- Width = Application.GetRealWidth(100),
+ Width = Application.GetRealWidth(100 + 10),
Height = Application.GetRealHeight(23),
TextID = StringId.shixuqi,
TextSize = TextSize.Text16,
TextColor = MusicColor.TextColor,
TextAlignment = TextAlignment.CenterLeft,
Gravity = Gravity.CenterVertical,
- IsMoreLines = true,
};
@@ -89,7 +88,7 @@
};
- public Button btnBottonRightImage = new Button
+ public Button btnRightImage = new Button
{
Width = Application.GetRealWidth(16),
Height = Application.GetRealWidth(16),
@@ -98,17 +97,16 @@
};
- public Button btnBottonRightName = new Button
+ public Button btnRightName = new Button
{
- Width = Application.GetRealWidth(100),
+ Width = Application.GetRealWidth(100 + 16),
Height = Application.GetRealHeight(23),
TextID = StringId.bofangqi,
TextSize = TextSize.Text16,
TextColor = MusicColor.TextColor,
TextAlignment = TextAlignment.CenterRight,
Gravity = Gravity.CenterVertical,
- Padding=new Padding(0,0,0,0),
- IsMoreLines = true,
+ Padding = new Padding(0, 0, 0, 0),
};
@@ -116,16 +114,16 @@
{
layout.AddChidren(multiFramLayout);
multiFramLayout.AddChidren(leftFramLayout);
- leftFramLayout.AddChidren(btnBottonLeftImage);
- leftFramLayout.AddChidren(btnBottonName);
+ leftFramLayout.AddChidren(btnLeftImage);
+ leftFramLayout.AddChidren(btnLeftName);
multiFramLayout.AddChidren(lineFramLayout);
multiFramLayout.AddChidren(rightFramLayout);
- rightFramLayout.AddChidren(btnBottonRightImage);
- rightFramLayout.AddChidren(btnBottonRightName);
- btnBottonName.X = btnBottonLeftImage.Right + Application.GetRealWidth(4);
+ rightFramLayout.AddChidren(btnRightImage);
+ rightFramLayout.AddChidren(btnRightName);
+ btnLeftName.X = btnLeftImage.Right + Application.GetRealWidth(4);
lineFramLayout.X = leftFramLayout.Right;
rightFramLayout.X = lineFramLayout.Right;
- btnBottonRightName.X = btnBottonLeftImage.Right + Application.GetRealWidth(4);
+ btnRightName.X = Application.GetRealWidth(4);
}
@@ -149,12 +147,12 @@
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
//leftFramLayout.BackgroundColor = this.UpBackgroundColor;
-
+
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
leftFramLayout.MouseUpEventHandler += UpClick;
- btnBottonLeftImage.MouseUpEventHandler += UpClick;
- btnBottonName.MouseUpEventHandler += UpClick;
+ btnLeftImage.MouseUpEventHandler += UpClick;
+ btnLeftName.MouseUpEventHandler += UpClick;
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
@@ -164,8 +162,8 @@
action?.Invoke(leftFramLayout);
};
leftFramLayout.MouseDownEventHandler += DownClick;
- btnBottonLeftImage.MouseDownEventHandler += DownClick;
- btnBottonName.MouseDownEventHandler += DownClick;
+ btnLeftImage.MouseDownEventHandler += DownClick;
+ btnLeftName.MouseDownEventHandler += DownClick;
}
/// <summary>
@@ -182,21 +180,21 @@
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
rightFramLayout.MouseUpEventHandler += UpClick;
- btnBottonRightImage.MouseUpEventHandler += UpClick;
- btnBottonRightName.MouseUpEventHandler += UpClick;
+ btnRightImage.MouseUpEventHandler += UpClick;
+ btnRightName.MouseUpEventHandler += UpClick;
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
{
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
//rightFramLayout.BackgroundColor =AksCommonMethod.seleBackgroundColor;
-
+
};
rightFramLayout.MouseDownEventHandler += DownClick;
- btnBottonRightImage.MouseDownEventHandler += DownClick;
- btnBottonRightName.MouseDownEventHandler += DownClick;
+ btnRightImage.MouseDownEventHandler += DownClick;
+ btnRightName.MouseDownEventHandler += DownClick;
}
-
+
}
--
Gitblit v1.8.0