From 1fa13087ee7be5502e2e42cbd07cf185cbc69a9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十月 2023 13:57:23 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' into wxr-2.2

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

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
index 67f3228..e99872c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
@@ -10,7 +10,7 @@
     {
 
         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;
 
@@ -18,7 +18,7 @@
         {
             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 +32,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, 10, 0, 10),
             Name = "btnName",
 
 
@@ -103,6 +102,7 @@
         /// </summary>
         public void AddLeftLine()
         {
+            btnLeftLine.Height = this.Height;
             this.AddChidren(btnLeftLine);
         }
         /// <summary>
@@ -110,6 +110,8 @@
         /// </summary>
         public void AddRightLine()
         {
+            btnRightLine.Height = this.Height;
+            btnRightLine.X = this.Width - Application.GetRealWidth(1);
             this.AddChidren(btnRightLine);
         }
 
@@ -118,6 +120,7 @@
         /// </summary>
         public void AddTopLine()
         {
+            btnTopLine.Width = this.Width;
             this.AddChidren(btnTopLine);
         }
         /// <summary>
@@ -125,6 +128,8 @@
         /// </summary>
         public void AddBottomLine()
         {
+            btnBottomLine.Y = this.Height - Application.GetRealHeight(1);
+            btnBottomLine.Width = this.Width;
             this.AddChidren(btnBottomLine);
         }
 
@@ -146,9 +151,12 @@
             EventHandler<MouseEventArgs> UpClick = (sender, e) =>
             {
                 this.BackgroundColor = 0x00000000;
-                action?.Invoke(this, btnImage, btnName);
+
                 //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
             };
+            btnImage.Tag = this.Tag;
+            btnName.Tag = this.Tag;
+
             this.MouseUpEventHandler += UpClick;
             btnImage.MouseUpEventHandler += UpClick;
             btnName.MouseUpEventHandler += UpClick;
@@ -156,9 +164,7 @@
 
             //EventHandler<MouseEventArgs> MoveClick = (sender, e) =>
             //{
-            //    Console.WriteLine("绉诲姩浜嬩欢=====");
             //    this.BackgroundColor = 0x00000000;
-            //    action?.Invoke(this, btnImage, btnName);
             //    //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
             //};
             //this.MouseMoveEventHandler += MoveClick;
@@ -167,9 +173,12 @@
 
             EventHandler<MouseEventArgs> DownClick = (sender, e) =>
             {
+                
                 //鎸変笅鍘绘敼鍙樿儗鏅鑹�
-                this.BackgroundColor = 0xff454635;
+                this.BackgroundColor = 0xFFF2F3F7;
+                action?.Invoke(this, btnImage, btnName);
             };
+
             this.MouseDownEventHandler += DownClick;
             btnImage.MouseDownEventHandler += DownClick;
             btnName.MouseDownEventHandler += DownClick;

--
Gitblit v1.8.0