From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
index f80c659..36723ff 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
@@ -10,9 +10,11 @@
{
public const int widthFrameLayout = 78;
- public const int heightFrameLayout = 84;
+ public const int heightFrameLayout = 84-6;
public const int lineW = 1;
public const int cornerValue = 8;
+
+
public ButtonFramLayout(int width= widthFrameLayout, int height= heightFrameLayout)
{
@@ -32,14 +34,14 @@
};
Button btnName = new Button
{
- Y = Application.GetRealHeight(12 + 32 + 8),
+ Y = Application.GetRealHeight(12 + 26 + 8),//(12 + 32 + 8)
Width = Application.GetRealWidth(widthFrameLayout),
Height = Application.GetRealHeight(20),
TextSize = TextSize.Text14,
TextColor = MusicColor.TextColor,
TextAlignment = TextAlignment.Center,
Gravity = Gravity.CenterHorizontal,
- Padding = new Padding(0, 20, 0, 20),
+ Padding = new Padding(0, 0, 0, 0),
Name = "btnName",
@@ -150,38 +152,39 @@
{
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
- this.BackgroundColor = 0x00000000;
+ if (!this.GetClick()) {
+ return;
+ }
+ action?.Invoke(this, btnImage, btnName);
+ SetHighlightColor(this);
+ //鎸変笅鍘绘敼鍙樿儗鏅鑹�
+ //this.BackgroundColor = AksCommonMethod.seleBackgroundColor;
- //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
- btnImage.Tag = this.Tag;
- btnName.Tag = this.Tag;
-
this.MouseUpEventHandler += UpClick;
btnImage.MouseUpEventHandler += UpClick;
btnName.MouseUpEventHandler += UpClick;
-
- //EventHandler<MouseEventArgs> MoveClick = (sender, e) =>
+ //EventHandler<MouseEventArgs> CancelClick = (sender, e) =>
//{
// this.BackgroundColor = 0x00000000;
// //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
//};
- //this.MouseMoveEventHandler += MoveClick;
- //btnImage.MouseMoveEventHandler += MoveClick;
- //btnName.MouseMoveEventHandler += MoveClick;
+ //this.MouseUpOutsideEventHandler += CancelClick;
+ //btnImage.MouseUpOutsideEventHandler += CancelClick;
+ //btnName.MouseUpOutsideEventHandler += CancelClick;
- EventHandler<MouseEventArgs> DownClick = (sender, e) =>
- {
-
- //鎸変笅鍘绘敼鍙樿儗鏅鑹�
- this.BackgroundColor = 0xFFEFEFEF;
- action?.Invoke(this, btnImage, btnName);
- };
+ //EventHandler<MouseEventArgs> DownClick = (sender, e) =>
+ //{
- this.MouseDownEventHandler += DownClick;
- btnImage.MouseDownEventHandler += DownClick;
- btnName.MouseDownEventHandler += DownClick;
+ // //鎸変笅鍘绘敼鍙樿儗鏅鑹�
+ // this.BackgroundColor = AksCommonMethod.seleBackgroundColor;
+
+ //};
+
+ //this.MouseDownEventHandler += DownClick;
+ //btnImage.MouseDownEventHandler += DownClick;
+ //btnName.MouseDownEventHandler += DownClick;
}
/// <summary>
/// 璁剧疆鍥炬爣
--
Gitblit v1.8.0