From 5ec581e5d37b108fc9d59e89afd8e94e21b32080 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 17 十月 2023 17:33:36 +0800
Subject: [PATCH] 2023年10月17日17:33:33

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs |   44 +++++++++++++++++++++++++++-----------------
 1 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
index 9bf4e83..ee23c59 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
@@ -10,15 +10,17 @@
     {
 
         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)
         {
             this.Width = Application.GetRealWidth(width);
             this.Height = Application.GetRealHeight(height);
-            this.Radius = (uint)Application.GetRealHeight(cornerValue);
+            //this.Radius = (uint)Application.GetRealHeight(cornerValue);
         }
 
         Button btnImage = new Button
@@ -32,15 +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),
-            IsMoreLines = true,
+            Padding = new Padding(0, 0, 0, 0),
             Name = "btnName",
 
 
@@ -103,6 +104,7 @@
         /// </summary>
         public void AddLeftLine()
         {
+            btnLeftLine.Height = this.Height;
             this.AddChidren(btnLeftLine);
         }
         /// <summary>
@@ -110,6 +112,8 @@
         /// </summary>
         public void AddRightLine()
         {
+            btnRightLine.Height = this.Height;
+            btnRightLine.X = this.Width - Application.GetRealWidth(1);
             this.AddChidren(btnRightLine);
         }
 
@@ -118,6 +122,7 @@
         /// </summary>
         public void AddTopLine()
         {
+            btnTopLine.Width = this.Width;
             this.AddChidren(btnTopLine);
         }
         /// <summary>
@@ -125,6 +130,8 @@
         /// </summary>
         public void AddBottomLine()
         {
+            btnBottomLine.Y = this.Height - Application.GetRealHeight(1);
+            btnBottomLine.Width = this.Width;
             this.AddChidren(btnBottomLine);
         }
 
@@ -145,30 +152,33 @@
         {
             EventHandler<MouseEventArgs> UpClick = (sender, e) =>
             {
+               
                 this.BackgroundColor = 0x00000000;
-            
+                action?.Invoke(this, btnImage, btnName);
+
                 //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
             };
             this.MouseUpEventHandler += UpClick;
             btnImage.MouseUpEventHandler += UpClick;
             btnName.MouseUpEventHandler += UpClick;
 
-
-            //EventHandler<MouseEventArgs> MoveClick = (sender, e) =>
-            //{
-            //    this.BackgroundColor = 0x00000000;
-            //    //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
-            //};
-            //this.MouseMoveEventHandler += MoveClick;
-            //btnImage.MouseMoveEventHandler += MoveClick;
-            //btnName.MouseMoveEventHandler += MoveClick;
+            EventHandler<MouseEventArgs> CancelClick = (sender, e) =>
+            {
+                this.BackgroundColor = 0x00000000;
+                //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
+            };
+            this.MouseUpOutsideEventHandler += CancelClick;
+            btnImage.MouseUpOutsideEventHandler += CancelClick;
+            btnName.MouseUpOutsideEventHandler += CancelClick;
 
             EventHandler<MouseEventArgs> DownClick = (sender, e) =>
             {
+              
                 //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-                this.BackgroundColor = 0xff454635;
-                action?.Invoke(this, btnImage, btnName);
+                this.BackgroundColor = AksCommonMethod.seleBackgroundColor;
+
             };
+
             this.MouseDownEventHandler += DownClick;
             btnImage.MouseDownEventHandler += DownClick;
             btnName.MouseDownEventHandler += DownClick;

--
Gitblit v1.8.0